From 3994e92d88ea5e08548f3a29315e08fffec5191a Mon Sep 17 00:00:00 2001 From: Ciprian Flroescu Date: Tue, 28 Jul 2020 15:07:38 +0300 Subject: [PATCH 1/3] Make mtk classes more specific to avoid CSS conflicts --- src/vs/editor/common/modes/supports/tokenization.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/modes/supports/tokenization.ts b/src/vs/editor/common/modes/supports/tokenization.ts index 12566c3b00e7b..721c41f9fc0c8 100644 --- a/src/vs/editor/common/modes/supports/tokenization.ts +++ b/src/vs/editor/common/modes/supports/tokenization.ts @@ -397,12 +397,13 @@ export class ThemeTrieElement { export function generateTokensCSSForColorMap(colorMap: Color[]): string { let rules: string[] = []; + const editorParentClass = ".monaco-editor"; for (let i = 1, len = colorMap.length; i < len; i++) { let color = colorMap[i]; - rules[i] = `.mtk${i} { color: ${color}; }`; + rules[i] = `${editorParentClass} .mtk${i} { color: ${color}; }`; } - rules.push('.mtki { font-style: italic; }'); - rules.push('.mtkb { font-weight: bold; }'); - rules.push('.mtku { text-decoration: underline; text-underline-position: under; }'); + rules.push(`${editorParentClass} .mtki { font-style: italic; }`); + rules.push(`${editorParentClass} .mtkb { font-weight: bold; }`); + rules.push(`${editorParentClass} .mtku { text-decoration: underline; text-underline-position: under; }`); return rules.join('\n'); } From 51fddb1e914765b4bf6644330b98f629921f936e Mon Sep 17 00:00:00 2001 From: Ciprian Flroescu Date: Tue, 28 Jul 2020 16:20:18 +0300 Subject: [PATCH 2/3] Replaced double quotes with single quotes --- src/vs/editor/common/modes/supports/tokenization.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/common/modes/supports/tokenization.ts b/src/vs/editor/common/modes/supports/tokenization.ts index 721c41f9fc0c8..8cade505f3a40 100644 --- a/src/vs/editor/common/modes/supports/tokenization.ts +++ b/src/vs/editor/common/modes/supports/tokenization.ts @@ -397,7 +397,7 @@ export class ThemeTrieElement { export function generateTokensCSSForColorMap(colorMap: Color[]): string { let rules: string[] = []; - const editorParentClass = ".monaco-editor"; + const editorParentClass = '.monaco-editor'; for (let i = 1, len = colorMap.length; i < len; i++) { let color = colorMap[i]; rules[i] = `${editorParentClass} .mtk${i} { color: ${color}; }`; From c89f8ff0f22be13d338c0d401192beadda2af98c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sun, 30 Aug 2020 22:24:05 +0200 Subject: [PATCH 3/3] small style change --- src/vs/editor/common/modes/supports/tokenization.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/common/modes/supports/tokenization.ts b/src/vs/editor/common/modes/supports/tokenization.ts index 8cade505f3a40..e701b60f0a9d1 100644 --- a/src/vs/editor/common/modes/supports/tokenization.ts +++ b/src/vs/editor/common/modes/supports/tokenization.ts @@ -397,13 +397,12 @@ export class ThemeTrieElement { export function generateTokensCSSForColorMap(colorMap: Color[]): string { let rules: string[] = []; - const editorParentClass = '.monaco-editor'; for (let i = 1, len = colorMap.length; i < len; i++) { let color = colorMap[i]; - rules[i] = `${editorParentClass} .mtk${i} { color: ${color}; }`; + rules[i] = `.monaco-editor .mtk${i} { color: ${color}; }`; } - rules.push(`${editorParentClass} .mtki { font-style: italic; }`); - rules.push(`${editorParentClass} .mtkb { font-weight: bold; }`); - rules.push(`${editorParentClass} .mtku { text-decoration: underline; text-underline-position: under; }`); + rules.push('.monaco-editor .mtki { font-style: italic; }'); + rules.push('.monaco-editor .mtkb { font-weight: bold; }'); + rules.push('.monaco-editor .mtku { text-decoration: underline; text-underline-position: under; }'); return rules.join('\n'); }