resolve comment variables against language at position, microsoft#102403

jrieken · jrieken · commit bb6ea237b84f · 2020-07-14T11:25:36.000+02:00
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -450,7 +450,7 @@ export class SnippetSession {
 				modelBasedVariableResolver,
 				new ClipboardBasedVariableResolver(readClipboardText, idx, indexedSelections.length, editor.getOption(EditorOption.multiCursorPaste) === 'spread'),
 				new SelectionBasedVariableResolver(model, selection),
-				new CommentBasedVariableResolver(model),
+				new CommentBasedVariableResolver(model, selection),
 				new TimeBasedVariableResolver,
 				new WorkspaceBasedVariableResolver(workspaceService),
 				new RandomBasedVariableResolver,
diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts
@@ -208,14 +208,15 @@ export class ClipboardBasedVariableResolver implements VariableResolver {
 }
 export class CommentBasedVariableResolver implements VariableResolver {
 	constructor(
-		private readonly _model: ITextModel
+		private readonly _model: ITextModel,
+		private readonly _selection: Selection
 	) {
 		//
 	}
 	resolve(variable: Variable): string | undefined {
 		const { name } = variable;
-		const language = this._model.getLanguageIdentifier();
-		const config = LanguageConfigurationRegistry.getComments(language.id);
+		const langId = this._model.getLanguageIdAtPosition(this._selection.selectionStartLineNumber, this._selection.selectionStartColumn);
+		const config = LanguageConfigurationRegistry.getComments(langId);
 		if (!config) {
 			return undefined;
 		}

Original file line number	Diff line number	Diff line change
`@@ -208,14 +208,15 @@ export class ClipboardBasedVariableResolver implements VariableResolver {`
`208`	`208`	`}`
`209`	`209`	`export class CommentBasedVariableResolver implements VariableResolver {`
`210`	`210`	`constructor(`
`211`		`- private readonly _model: ITextModel`
	`211`	`+ private readonly _model: ITextModel,`
	`212`	`+ private readonly _selection: Selection`
`212`	`213`	`) {`
`213`	`214`	`//`
`214`	`215`	`}`
`215`	`216`	`resolve(variable: Variable): string \| undefined {`
`216`	`217`	`const { name } = variable;`
`217`		`- const language = this._model.getLanguageIdentifier();`
`218`		`- const config = LanguageConfigurationRegistry.getComments(language.id);`
	`218`	`+ const langId = this._model.getLanguageIdAtPosition(this._selection.selectionStartLineNumber, this._selection.selectionStartColumn);`
	`219`	`+ const config = LanguageConfigurationRegistry.getComments(langId);`
`219`	`220`	`if (!config) {`
`220`	`221`	`return undefined;`
`221`	`222`	`}`