fix microsoft#32484

jrieken · jrieken · commit b2e70a254dc6 · 2018-09-17T16:38:31.000+02:00
diff --git a/src/vs/editor/contrib/snippet/snippetSession.css b/src/vs/editor/contrib/snippet/snippetSession.css
@@ -3,10 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-editor.vs		.snippet-placeholder { background-color: rgba(10, 50, 100, 0.2); min-width: 2px; }
-.monaco-editor.vs-dark	.snippet-placeholder { background-color: rgba(124, 124, 124, 0.3); min-width: 2px; }
-.monaco-editor.hc-black	.snippet-placeholder { background-color: rgba(124, 124, 124, 0.3); min-width: 2px; }
+.monaco-editor .snippet-placeholder {
+	min-width: 2px;
+}
 
-.monaco-editor.vs		.finish-snippet-placeholder { outline: rgba(10, 50, 100, 0.5) solid 1px; }
-.monaco-editor.vs-dark	.finish-snippet-placeholder	{ outline: #525252 solid 1px; }
-.monaco-editor.hc-black	.finish-snippet-placeholder	{ outline: #525252 solid 1px; }
+.monaco-editor .finish-snippet-placeholder {
+	outline-style: solid;
+	outline-width: 1px;
+}
diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts
@@ -20,6 +20,13 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { optional } from 'vs/platform/instantiation/common/instantiation';
 import { Choice, Placeholder, SnippetParser, Text, TextmateSnippet } from './snippetParser';
 import { ClipboardBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, SelectionBasedVariableResolver, TimeBasedVariableResolver } from './snippetVariables';
+import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
+import { snippetsPlaceholderBackground, snippetsFinalPlaceholderBorder } from 'vs/platform/theme/common/colorRegistry';
+
+registerThemingParticipant((theme, collector) => {
+	collector.addRule(`.monaco-editor .snippet-placeholder { background-color: ${theme.getColor(snippetsPlaceholderBackground)}}`);
+	collector.addRule(`.monaco-editor .finish-snippet-placeholder { outline-color: ${theme.getColor(snippetsFinalPlaceholderBorder)}}`);
+});
 
 export class OneSnippet {
 
diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts
@@ -292,6 +292,12 @@ export const diffRemovedOutline = registerColor('diffEditor.removedTextBorder',
 
 export const diffBorder = registerColor('diffEditor.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('diffEditorBorder', 'Border color between the two text editors.'));
 
+/**
+ * Snippet placeholder colors
+ */
+export const snippetsPlaceholderBackground = registerColor('snippetPlaceholder.brackground', { dark: new Color(new RGBA(124, 124, 124, 0.3)), light: new Color(new RGBA(10, 50, 100, 0.2)), hc: new Color(new RGBA(124, 124, 124, 0.3)) }, nls.localize('snippetPlaceholder', "Background color of a snippet placeholder"));
+export const snippetsFinalPlaceholderBorder = registerColor('snippetFinalPlaceholder.border', { dark: '#525252', light: new Color(new RGBA(10, 50, 100, 0.5)), hc: '#525252' }, nls.localize('snippetFinalPlaceholder', "Border of the final placeholder of a snippet."));
+
 /**
  * Breadcrumb colors
  */
