From ff8b85ffa3be60ce312e89150e61979e1e540b41 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 May 2017 11:27:25 +0200 Subject: [PATCH] properly spelled out decoration options --- .../contrib/snippet/browser/editorSnippets.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/contrib/snippet/browser/editorSnippets.ts b/src/vs/editor/contrib/snippet/browser/editorSnippets.ts index e77d8defd54..8b0e86d2569 100644 --- a/src/vs/editor/contrib/snippet/browser/editorSnippets.ts +++ b/src/vs/editor/contrib/snippet/browser/editorSnippets.ts @@ -24,8 +24,11 @@ class OneSnippet { private _placeholderGroups: Placeholder[][]; private _placeholderGroupsIdx: number; - private static readonly _growingDecoration: IModelDecorationOptions = { stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }; - private static readonly _fixedDecoration: IModelDecorationOptions = { stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges }; + private static readonly _decorations = { + active: { stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges }, + activeFinal: { stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges }, + inActive: { stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges }, + }; constructor(editor: ICommonCodeEditor, snippet: TextmateSnippet, offset: number) { this._editor = editor; @@ -61,7 +64,7 @@ class OneSnippet { const end = model.getPositionAt(this._offset + placeholderOffset + placeholderLen); const range = new Range(start.lineNumber, start.column, end.lineNumber, end.column); - const handle = accessor.addDecoration(range, OneSnippet._fixedDecoration); + const handle = accessor.addDecoration(range, OneSnippet._decorations.inActive); this._placeholderDecorations.set(placeholder, handle); lastRange = range; @@ -104,7 +107,7 @@ class OneSnippet { if (prevGroupsIdx !== -1) { for (const placeholder of this._placeholderGroups[prevGroupsIdx]) { const id = this._placeholderDecorations.get(placeholder); - accessor.changeDecorationOptions(id, OneSnippet._fixedDecoration); + accessor.changeDecorationOptions(id, OneSnippet._decorations.inActive); } } @@ -117,7 +120,7 @@ class OneSnippet { const range = this._editor.getModel().getDecorationRange(id); selections.push(new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn)); - accessor.changeDecorationOptions(id, placeholder.isFinalTabstop ? OneSnippet._fixedDecoration : OneSnippet._growingDecoration); + accessor.changeDecorationOptions(id, placeholder.isFinalTabstop ? OneSnippet._decorations.activeFinal : OneSnippet._decorations.active); } return selections; }); -- GitLab