Skip to content

Commit 5f9ca13

Browse files
alexdimaalexdima
committed
Move inspectTMScropes to /browser/ (microsoft#69102)
1 parent a988208 commit 5f9ca13

6 files changed

Lines changed: 22 additions & 8 deletions

File tree

‎src/tsconfig.strictNullChecks.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"./vs/workbench/contrib/codeEditor/browser/selectionClipboard.ts",
149149
"./vs/workbench/contrib/codeEditor/electron-browser/sleepResumeRepaintMinimap.ts",
150150
"./vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts",
151-
"./vs/workbench/contrib/codeEditor/electron-browser/textMate/inspectTMScopes.ts",
151+
"./vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.ts",
152152
"./vs/workbench/contrib/codeEditor/browser/toggleMinimap.ts",
153153
"./vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.ts",
154154
"./vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.ts",
@@ -406,7 +406,7 @@
406406
"./vs/workbench/services/search/test/node/textSearch.integrationTest.ts",
407407
"./vs/workbench/services/search/test/node/textSearchManager.test.ts",
408408
"./vs/workbench/services/textMate/electron-browser/TMGrammars.ts",
409-
"./vs/workbench/services/textMate/electron-browser/TMHelper.ts",
409+
"./vs/workbench/services/textMate/common/TMHelper.ts",
410410
"./vs/workbench/services/textMate/electron-browser/TMSyntax.ts",
411411
"./vs/workbench/services/textMate/common/textMateService.ts",
412412
"./vs/workbench/services/textfile/common/textfiles.ts",

src/vs/workbench/contrib/codeEditor/electron-browser/textMate/inspectTMScopes.css renamed to src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.css

File renamed without changes.

src/vs/workbench/contrib/codeEditor/electron-browser/textMate/inspectTMScopes.ts renamed to src/vs/workbench/contrib/codeEditor/browser/inspectTMScopes/inspectTMScopes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
2121
import { INotificationService } from 'vs/platform/notification/common/notification';
2222
import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
2323
import { HIGH_CONTRAST, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
24-
import { findMatchingThemeRule } from 'vs/workbench/services/textMate/electron-browser/TMHelper';
24+
import { findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
2525
import { ITextMateService, IGrammar, IToken, StackElement } from 'vs/workbench/services/textMate/common/textMateService';
2626
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
2727

‎src/vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import '../browser/accessibility/accessibility';
88
import '../browser/inspectKeybindings';
99
import '../browser/largeFileOptimizations';
1010
import '../browser/selectionClipboard';
11-
import './sleepResumeRepaintMinimap';
12-
import './textMate/inspectTMScopes';
11+
import '../browser/inspectTMScopes/inspectTMScopes';
1312
import '../browser/toggleMinimap';
1413
import '../browser/toggleMultiCursorModifier';
1514
import '../browser/toggleRenderControlCharacter';
1615
import '../browser/toggleRenderWhitespace';
1716
import '../browser/toggleWordWrap';
18-
import '../browser/workbenchReferenceSearch';
17+
import '../browser/workbenchReferenceSearch';
18+
import './sleepResumeRepaintMinimap';

‎src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { toResource } from 'vs/workbench/common/editor';
1515
import { ITextMateService } from 'vs/workbench/services/textMate/common/textMateService';
1616
import { IGrammar, StackElement } from 'vscode-textmate';
1717
import { TokenizationRegistry, TokenMetadata } from 'vs/editor/common/modes';
18-
import { ThemeRule, findMatchingThemeRule } from 'vs/workbench/services/textMate/electron-browser/TMHelper';
18+
import { ThemeRule, findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
1919
import { Color } from 'vs/base/common/color';
2020

2121
interface IToken {

src/vs/workbench/services/textMate/electron-browser/TMHelper.ts renamed to src/vs/workbench/services/textMate/common/TMHelper.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IColorTheme, ITokenColorizationSetting } from 'vs/workbench/services/themes/common/workbenchThemeService';
6+
export interface IColorTheme {
7+
readonly tokenColors: ITokenColorizationRule[];
8+
}
9+
10+
export interface ITokenColorizationRule {
11+
name?: string;
12+
scope?: string | string[];
13+
settings: ITokenColorizationSetting;
14+
}
15+
16+
export interface ITokenColorizationSetting {
17+
foreground?: string;
18+
background?: string;
19+
fontStyle?: string; // italic, underline, bold
20+
}
721

822
export function findMatchingThemeRule(theme: IColorTheme, scopes: string[], onlyColorRules: boolean = true): ThemeRule | null {
923
for (let i = scopes.length - 1; i >= 0; i--) {

0 commit comments

Comments
 (0)