From 7c471f6415d8cb9b5e1b77bc1663e187fe8ca5cb Mon Sep 17 00:00:00 2001 From: Justin Chen <54879025+justschen@users.noreply.github.com> Date: Sun, 21 Jan 2024 23:20:21 -0800 Subject: [PATCH] ensures correct diagnostic contributions to highlight code actions (#202978) ensures correct diagnostic contributions to highlight --- .../contrib/codeAction/browser/codeActionController.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts index 57aa30ff33f..ad34973eddf 100644 --- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts +++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts @@ -289,8 +289,10 @@ export class CodeActionController extends Disposable implements IEditorContribut const decorations: IModelDeltaDecoration[] = action.action.diagnostics.map(diagnostic => ({ range: diagnostic, options: CodeActionController.DECORATION })); currentDecorations.set(decorations); const diagnostic = action.action.diagnostics[0]; - const selectionText = this._editor.getModel()?.getWordAtPosition({ lineNumber: diagnostic.startLineNumber, column: diagnostic.startColumn })?.word; - aria.status(localize('editingNewSelection', "Context: {0} at line {1} and column {2}.", selectionText, diagnostic.startLineNumber, diagnostic.startColumn)); + if (diagnostic.startLineNumber && diagnostic.startColumn) { + const selectionText = this._editor.getModel()?.getWordAtPosition({ lineNumber: diagnostic.startLineNumber, column: diagnostic.startColumn })?.word; + aria.status(localize('editingNewSelection', "Context: {0} at line {1} and column {2}.", selectionText, diagnostic.startLineNumber, diagnostic.startColumn)); + } } else { currentDecorations.clear(); }