Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-14 12:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve comment variables against language at position, https://github.com/microsoft/vscode/issues/102403

Browse Source
This commit is contained in:
Johannes Rieken
2020-07-14 11:25:36 +02:00
parent e6488d3e82
commit bb6ea237b8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/snippet/snippetSession.ts
+1 -1
View File
@@ -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,
src/vs/editor/contrib/snippet/snippetVariables.ts
+4 -3
View File
@@ -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;
}