@theia/monaco 1.18.0 → 1.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/data/monaco-nls.json +1379 -0
- package/lib/browser/monaco-command.d.ts +11 -2
- package/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +29 -17
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-editor-model.d.ts +1 -2
- package/lib/browser/monaco-editor-model.d.ts.map +1 -1
- package/lib/browser/monaco-editor-model.js +1 -1
- package/lib/browser/monaco-editor-model.js.map +1 -1
- package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
- package/lib/browser/monaco-editor-provider.js.map +1 -1
- package/lib/browser/monaco-frontend-module.js +1 -1
- package/lib/browser/monaco-frontend-module.js.map +1 -1
- package/lib/browser/monaco-languages.d.ts +2 -3
- package/lib/browser/monaco-languages.d.ts.map +1 -1
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-loader.d.ts.map +1 -1
- package/lib/browser/monaco-loader.js +30 -2
- package/lib/browser/monaco-loader.js.map +1 -1
- package/lib/browser/monaco-menu.d.ts +1 -0
- package/lib/browser/monaco-menu.d.ts.map +1 -1
- package/lib/browser/monaco-menu.js +45 -2
- package/lib/browser/monaco-menu.js.map +1 -1
- package/lib/browser/workspace-symbol-command.d.ts +3 -3
- package/lib/browser/workspace-symbol-command.d.ts.map +1 -1
- package/lib/browser/workspace-symbol-command.js +13 -4
- package/lib/browser/workspace-symbol-command.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/monaco-command.ts +33 -19
- package/src/browser/monaco-editor-model.ts +1 -2
- package/src/browser/monaco-editor-provider.ts +1 -1
- package/src/browser/monaco-frontend-module.ts +1 -1
- package/src/browser/monaco-languages.ts +2 -4
- package/src/browser/monaco-loader.ts +31 -2
- package/src/browser/monaco-menu.ts +49 -3
- package/src/browser/style/index.css +15 -0
- package/src/browser/workspace-symbol-command.ts +17 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-loader.js","sourceRoot":"","sources":["../../src/browser/monaco-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,uDAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"monaco-loader.js","sourceRoot":"","sources":["../../src/browser/monaco-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export interface MonacoActionGroup {
|
|
|
22
22
|
export declare namespace MonacoMenus {
|
|
23
23
|
const SELECTION: string[];
|
|
24
24
|
const PEEK_CONTEXT_SUBMENU: MenuPath;
|
|
25
|
+
const MARKERS_GROUP: string[];
|
|
25
26
|
}
|
|
26
27
|
export declare class MonacoEditorMenuContribution implements MenuContribution {
|
|
27
28
|
protected readonly commands: MonacoCommandRegistry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAiB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AACD,yBAAiB,WAAW,CAAC;IAClB,MAAM,SAAS,UAAoC,CAAC;IACpD,MAAM,oBAAoB,EAAE,QAAiE,CAAC;IAC9F,MAAM,aAAa,UAA4C,CAAC;CAC1E;AAED,qBACa,4BAA6B,YAAW,gBAAgB;IAG9B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;gBAA/B,QAAQ,EAAE,qBAAqB;IAGrF,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IA0EhD,SAAS,CAAC,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAehE,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAGlD"}
|
|
@@ -32,11 +32,13 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
32
32
|
const common_1 = require("@theia/core/lib/common");
|
|
33
33
|
const browser_1 = require("@theia/editor/lib/browser");
|
|
34
34
|
const monaco_command_registry_1 = require("./monaco-command-registry");
|
|
35
|
+
const nls_1 = require("@theia/core/lib/common/nls");
|
|
35
36
|
var MenuRegistry = monaco.actions.MenuRegistry;
|
|
36
37
|
var MonacoMenus;
|
|
37
38
|
(function (MonacoMenus) {
|
|
38
39
|
MonacoMenus.SELECTION = [...common_1.MAIN_MENU_BAR, '3_selection'];
|
|
39
40
|
MonacoMenus.PEEK_CONTEXT_SUBMENU = [...browser_1.EDITOR_CONTEXT_MENU, 'navigation', 'peek_submenu'];
|
|
41
|
+
MonacoMenus.MARKERS_GROUP = [...browser_1.EditorMainMenu.GO, '5_markers_group'];
|
|
40
42
|
})(MonacoMenus = exports.MonacoMenus || (exports.MonacoMenus = {}));
|
|
41
43
|
let MonacoEditorMenuContribution = class MonacoEditorMenuContribution {
|
|
42
44
|
constructor(commands) {
|
|
@@ -54,7 +56,7 @@ let MonacoEditorMenuContribution = class MonacoEditorMenuContribution {
|
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
this.registerPeekSubmenu(registry);
|
|
57
|
-
registry.registerSubmenu(MonacoMenus.SELECTION, 'Selection');
|
|
59
|
+
registry.registerSubmenu(MonacoMenus.SELECTION, nls_1.nls.localize('vscode/menubar/mSelection', 'Selection'));
|
|
58
60
|
for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.MenubarSelectionMenu)) {
|
|
59
61
|
if (!monaco.actions.isIMenuItem(item)) {
|
|
60
62
|
continue;
|
|
@@ -68,9 +70,50 @@ let MonacoEditorMenuContribution = class MonacoEditorMenuContribution {
|
|
|
68
70
|
registry.registerMenuAction(menuPath, { commandId, order, label });
|
|
69
71
|
}
|
|
70
72
|
}
|
|
73
|
+
// Builtin monaco language features commands.
|
|
74
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
75
|
+
commandId: 'editor.action.quickOutline',
|
|
76
|
+
label: nls_1.nls.localize('vscode/gotoSymbolQuickAccess/gotoSymbol', 'Go to Symbol in Editor...'),
|
|
77
|
+
order: '1'
|
|
78
|
+
});
|
|
79
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
80
|
+
commandId: 'editor.action.revealDefinition',
|
|
81
|
+
order: '2'
|
|
82
|
+
});
|
|
83
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
84
|
+
commandId: 'editor.action.revealDeclaration',
|
|
85
|
+
order: '3'
|
|
86
|
+
});
|
|
87
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
88
|
+
commandId: 'editor.action.goToTypeDefinition',
|
|
89
|
+
order: '4'
|
|
90
|
+
});
|
|
91
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
92
|
+
commandId: 'editor.action.goToImplementation',
|
|
93
|
+
order: '5'
|
|
94
|
+
});
|
|
95
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
96
|
+
commandId: 'editor.action.goToReferences',
|
|
97
|
+
order: '6'
|
|
98
|
+
});
|
|
99
|
+
registry.registerMenuAction(browser_1.EditorMainMenu.LOCATION_GROUP, {
|
|
100
|
+
commandId: 'editor.action.jumpToBracket',
|
|
101
|
+
order: '2'
|
|
102
|
+
});
|
|
103
|
+
// Builtin monaco problem commands.
|
|
104
|
+
registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
|
|
105
|
+
commandId: 'editor.action.marker.nextInFiles',
|
|
106
|
+
label: nls_1.nls.localize('vscode/gotoError/miGotoNextProblem', 'Next Problem'),
|
|
107
|
+
order: '1'
|
|
108
|
+
});
|
|
109
|
+
registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
|
|
110
|
+
commandId: 'editor.action.marker.prevInFiles',
|
|
111
|
+
label: nls_1.nls.localize('vscode/gotoError/miGotoPreviousProblem', 'Previous Problem'),
|
|
112
|
+
order: '2'
|
|
113
|
+
});
|
|
71
114
|
}
|
|
72
115
|
registerPeekSubmenu(registry) {
|
|
73
|
-
registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, 'Peek');
|
|
116
|
+
registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, nls_1.nls.localize('vscode/goToCommands/peek.submenu', 'Peek'));
|
|
74
117
|
for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.EditorContextPeek)) {
|
|
75
118
|
if (!monaco.actions.isIMenuItem(item)) {
|
|
76
119
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;AAElF,4DAAkE;AAClE,mDAAsG;AACtG,
|
|
1
|
+
{"version":3,"file":"monaco-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-menu.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;AAElF,4DAAkE;AAClE,mDAAsG;AACtG,uDAAgF;AAChF,uEAAkE;AAClE,oDAAiD;AACjD,IAAO,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;AAMlD,IAAiB,WAAW,CAI3B;AAJD,WAAiB,WAAW;IACX,qBAAS,GAAG,CAAC,GAAG,sBAAa,EAAE,aAAa,CAAC,CAAC;IAC9C,gCAAoB,GAAa,CAAC,GAAG,6BAAmB,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;IACxF,yBAAa,GAAG,CAAC,GAAG,wBAAc,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAC3E,CAAC,EAJgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAI3B;AAGD,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAErC,YACsD,QAA+B;QAA/B,aAAQ,GAAR,QAAQ,CAAuB;IACjF,CAAC;IAEL,aAAa,CAAC,QAA2B;QACrC,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/E,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;gBACnC,SAAS;aACZ;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,SAAS,EAAE;gBACX,MAAM,QAAQ,GAAG,CAAC,GAAG,6BAAmB,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC9D,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;aACxD;SACJ;QAED,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAEnC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,SAAS,EAAE,SAAG,CAAC,QAAQ,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC,CAAC;QACxG,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACtF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;gBACnC,SAAS;aACZ;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,SAAS,EAAE;gBACX,MAAM,QAAQ,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChE,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;gBACrG,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;aACtE;SACJ;QAED,6CAA6C;QAC7C,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,4BAA4B;YACvC,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,yCAAyC,EAAE,2BAA2B,CAAC;YAC3F,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,gCAAgC;YAC3C,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,iCAAiC;YAC5C,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,kCAAkC;YAC7C,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,kCAAkC;YAC7C,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,uBAAuB,EAAE;YAChE,SAAS,EAAE,8BAA8B;YACzC,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,QAAQ,CAAC,kBAAkB,CAAC,wBAAc,CAAC,cAAc,EAAE;YACvD,SAAS,EAAE,6BAA6B;YACxC,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QAEH,mCAAmC;QACnC,QAAQ,CAAC,kBAAkB,CAAC,WAAW,CAAC,aAAa,EAAE;YACnD,SAAS,EAAE,kCAAkC;YAC7C,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,oCAAoC,EAAE,cAAc,CAAC;YACzE,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC,WAAW,CAAC,aAAa,EAAE;YACnD,SAAS,EAAE,kCAAkC;YAC7C,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,wCAAwC,EAAE,kBAAkB,CAAC;YACjF,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;IACP,CAAC;IAES,mBAAmB,CAAC,QAA2B;QACrD,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,oBAAoB,EAAE,SAAG,CAAC,QAAQ,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC,CAAC;QAErH,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;gBACnC,SAAS;aACZ;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,SAAS,EAAE;gBACX,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,WAAW,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;aAC9G;SACJ;IACL,CAAC;IAES,cAAc,CAAC,KAAa;QAClC,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;CACJ,CAAA;AAlGY,4BAA4B;IADxC,sBAAU,EAAE;IAIJ,WAAA,kBAAM,CAAC,+CAAqB,CAAC,CAAA;qCAA8B,+CAAqB;GAH5E,4BAA4B,CAkGxC;AAlGY,oEAA4B"}
|
|
@@ -15,11 +15,10 @@
|
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { KeybindingContribution, KeybindingRegistry, OpenerService, LabelProvider } from '@theia/core/lib/browser';
|
|
17
17
|
import { QuickAccessContribution, QuickAccessProvider, QuickInputService, QuickAccessRegistry, QuickPicks, QuickPickItem } from '@theia/core/lib/browser/quick-input';
|
|
18
|
-
import { CommandRegistry, CommandHandler, SelectionService, CancellationToken } from '@theia/core/lib/common';
|
|
19
|
-
import { CommandContribution } from '@theia/core/lib/common';
|
|
18
|
+
import { CommandRegistry, CommandHandler, SelectionService, CancellationToken, CommandContribution, MenuContribution, MenuModelRegistry } from '@theia/core/lib/common';
|
|
20
19
|
import { SymbolInformation } from '@theia/core/shared/vscode-languageserver-types';
|
|
21
20
|
import { MonacoLanguages, WorkspaceSymbolProvider } from './monaco-languages';
|
|
22
|
-
export declare class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContribution, KeybindingContribution, CommandHandler, QuickAccessContribution {
|
|
21
|
+
export declare class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContribution, KeybindingContribution, MenuContribution, CommandHandler, QuickAccessContribution {
|
|
23
22
|
static readonly PREFIX = "#";
|
|
24
23
|
private command;
|
|
25
24
|
protected readonly languages: MonacoLanguages;
|
|
@@ -31,6 +30,7 @@ export declare class WorkspaceSymbolCommand implements QuickAccessProvider, Comm
|
|
|
31
30
|
isEnabled(): boolean;
|
|
32
31
|
execute(): void;
|
|
33
32
|
registerCommands(commands: CommandRegistry): void;
|
|
33
|
+
registerMenus(menus: MenuModelRegistry): void;
|
|
34
34
|
private isElectron;
|
|
35
35
|
registerKeybindings(keybindings: KeybindingRegistry): void;
|
|
36
36
|
registerQuickAccessProvider(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-symbol-command.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-symbol-command.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACnH,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,UAAU,EAAE,aAAa,EAAe,MAAM,qCAAqC,CAAC;AACnL,OAAO,EACH,eAAe,EAAE,cAAc,EAAW,gBAAgB,EAAE,iBAAiB,EAC7E,mBAAmB,EAAE,gBAAgB,EAAE,iBAAiB,EAC3D,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAmB,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEpG,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAI9E,qBACa,sBAAuB,YAAW,mBAAmB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,cAAc,EAAE,uBAAuB;IACtK,gBAAuB,MAAM,OAAO;IAEpC,OAAO,CAAC,OAAO,CAGqC;IAE3B,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC7C,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACtD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,IAAI,OAAO;IAIpB,OAAO,IAAI,IAAI;IAIf,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAIjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAO7C,OAAO,CAAC,UAAU;IAIlB,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAO1D,2BAA2B,IAAI,IAAI;IAS7B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IAkC7E,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,aAAa;IAmCxI,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS;IAQxF,OAAO,CAAC,OAAO;CAKlB;AAED,aAAK,UAAU;IACX,IAAI,IAAI;IACR,MAAM,IAAI;IACV,SAAS,IAAI;IACb,OAAO,IAAI;IACX,KAAK,IAAI;IACT,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,KAAK,IAAI;IACT,WAAW,IAAI;IACf,IAAI,KAAK;IACT,SAAS,KAAK;IACd,QAAQ,KAAK;IACb,QAAQ,KAAK;IACb,QAAQ,KAAK;IACb,MAAM,KAAK;IACX,MAAM,KAAK;IACX,OAAO,KAAK;IACZ,KAAK,KAAK;IACV,MAAM,KAAK;IACX,GAAG,KAAK;IACR,IAAI,KAAK;IACT,UAAU,KAAK;IACf,MAAM,KAAK;IACX,KAAK,KAAK;IACV,QAAQ,KAAK;IACb,aAAa,KAAK;CACrB"}
|
|
@@ -34,12 +34,13 @@ const common_1 = require("@theia/core/lib/common");
|
|
|
34
34
|
const vscode_languageserver_types_1 = require("@theia/core/shared/vscode-languageserver-types");
|
|
35
35
|
const monaco_languages_1 = require("./monaco-languages");
|
|
36
36
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
37
|
+
const browser_2 = require("@theia/editor/lib/browser");
|
|
37
38
|
let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCommand {
|
|
38
39
|
constructor() {
|
|
39
|
-
this.command = {
|
|
40
|
+
this.command = common_1.Command.toLocalizedCommand({
|
|
40
41
|
id: 'languages.workspace.symbol',
|
|
41
42
|
label: 'Go to Symbol in Workspace...'
|
|
42
|
-
};
|
|
43
|
+
}, 'vscode/search.contribution/showTriggerActions');
|
|
43
44
|
}
|
|
44
45
|
isEnabled() {
|
|
45
46
|
return this.languages.workspaceSymbolProviders !== undefined;
|
|
@@ -50,6 +51,12 @@ let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCom
|
|
|
50
51
|
registerCommands(commands) {
|
|
51
52
|
commands.registerCommand(this.command, this);
|
|
52
53
|
}
|
|
54
|
+
registerMenus(menus) {
|
|
55
|
+
menus.registerMenuAction(browser_2.EditorMainMenu.WORKSPACE_GROUP, {
|
|
56
|
+
commandId: this.command.id,
|
|
57
|
+
order: '2'
|
|
58
|
+
});
|
|
59
|
+
}
|
|
53
60
|
isElectron() {
|
|
54
61
|
return environment_1.environment.electron.is();
|
|
55
62
|
}
|
|
@@ -64,7 +71,7 @@ let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCom
|
|
|
64
71
|
getInstance: () => this,
|
|
65
72
|
prefix: WorkspaceSymbolCommand_1.PREFIX,
|
|
66
73
|
placeholder: '',
|
|
67
|
-
helpEntries: [{ description: 'Go to Symbol in Workspace', needsEditor: false }]
|
|
74
|
+
helpEntries: [{ description: common_1.nls.localize('vscode/search.contribution/symbolsQuickAccess', 'Go to Symbol in Workspace'), needsEditor: false }]
|
|
68
75
|
});
|
|
69
76
|
}
|
|
70
77
|
async getPicks(filter, token) {
|
|
@@ -90,7 +97,9 @@ let WorkspaceSymbolCommand = WorkspaceSymbolCommand_1 = class WorkspaceSymbolCom
|
|
|
90
97
|
const filteredSymbols = symbols.filter(el => el && el.length !== 0);
|
|
91
98
|
if (filteredSymbols.length === 0) {
|
|
92
99
|
items.push({
|
|
93
|
-
label: filter.length === 0
|
|
100
|
+
label: filter.length === 0
|
|
101
|
+
? common_1.nls.localize('theia/monaco/typeToSearchForSymbols', 'Type to search for symbols')
|
|
102
|
+
: common_1.nls.localize('theia/monaco/noSymbolsMatching', 'No symbols matching'),
|
|
94
103
|
});
|
|
95
104
|
}
|
|
96
105
|
}).catch();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,4DAAkE;AAClE,+FAA4F;AAC5F,qDAAmH;
|
|
1
|
+
{"version":3,"file":"workspace-symbol-command.js","sourceRoot":"","sources":["../../src/browser/workspace-symbol-command.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.19.0",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/markers": "1.
|
|
6
|
+
"@theia/core": "1.19.0",
|
|
7
|
+
"@theia/editor": "1.19.0",
|
|
8
|
+
"@theia/filesystem": "1.19.0",
|
|
9
|
+
"@theia/markers": "1.19.0",
|
|
10
10
|
"@theia/monaco-editor-core": "0.23.0",
|
|
11
|
-
"@theia/outline-view": "1.
|
|
12
|
-
"@theia/workspace": "1.
|
|
11
|
+
"@theia/outline-view": "1.19.0",
|
|
12
|
+
"@theia/workspace": "1.19.0",
|
|
13
13
|
"fast-plist": "^0.1.2",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -51,10 +51,10 @@
|
|
|
51
51
|
"watch": "theiaext watch"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@theia/ext-scripts": "1.
|
|
54
|
+
"@theia/ext-scripts": "1.19.0"
|
|
55
55
|
},
|
|
56
56
|
"nyc": {
|
|
57
57
|
"extends": "../../configs/nyc.json"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "cebb5417bb40e320178e3a4e66070af514f0525f"
|
|
60
60
|
}
|
|
@@ -18,12 +18,13 @@ import { injectable, inject, optional } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { Position, Location } from '@theia/core/shared/vscode-languageserver-types';
|
|
19
19
|
import { CommandContribution, CommandRegistry, CommandHandler } from '@theia/core/lib/common/command';
|
|
20
20
|
import { CommonCommands, QuickInputService, ApplicationShell } from '@theia/core/lib/browser';
|
|
21
|
-
import { EditorCommands, EditorManager } from '@theia/editor/lib/browser';
|
|
21
|
+
import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
|
|
22
22
|
import { MonacoEditor } from './monaco-editor';
|
|
23
23
|
import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-command-registry';
|
|
24
24
|
import { MonacoEditorService } from './monaco-editor-service';
|
|
25
25
|
import { MonacoTextModelService } from './monaco-text-model-service';
|
|
26
26
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
27
|
+
import { nls } from '@theia/core/lib/common/nls';
|
|
27
28
|
|
|
28
29
|
export namespace MonacoCommands {
|
|
29
30
|
|
|
@@ -191,6 +192,7 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
191
192
|
this.monacoCommandRegistry.registerHandler(EditorCommands.CONFIG_EOL.id, this.newConfigEolHandler());
|
|
192
193
|
this.monacoCommandRegistry.registerHandler(EditorCommands.INDENT_USING_SPACES.id, this.newConfigTabSizeHandler(true));
|
|
193
194
|
this.monacoCommandRegistry.registerHandler(EditorCommands.INDENT_USING_TABS.id, this.newConfigTabSizeHandler(false));
|
|
195
|
+
this.monacoCommandRegistry.registerHandler(EditorCommands.REVERT_EDITOR.id, this.newRevertActiveEditorHandler());
|
|
194
196
|
this.monacoCommandRegistry.registerHandler(EditorCommands.REVERT_AND_CLOSE.id, this.newRevertAndCloseActiveEditorHandler());
|
|
195
197
|
}
|
|
196
198
|
|
|
@@ -214,11 +216,10 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
214
216
|
}
|
|
215
217
|
protected configureIndentation(editor: MonacoEditor): void {
|
|
216
218
|
const items = [true, false].map(useSpaces => ({
|
|
217
|
-
label: `Indent Using ${useSpaces ? 'Spaces' : 'Tabs'}
|
|
219
|
+
label: nls.localize(`vscode/indentation/indentUsing${useSpaces ? 'Spaces' : 'Tabs'}`, `Indent Using ${useSpaces ? 'Spaces' : 'Tabs'}`),
|
|
218
220
|
execute: () => this.configureTabSize(editor, useSpaces)
|
|
219
|
-
})
|
|
220
|
-
);
|
|
221
|
-
this.quickInputService?.showQuickPick(items, { placeholder: 'Select Action' });
|
|
221
|
+
}));
|
|
222
|
+
this.quickInputService?.showQuickPick(items, { placeholder: nls.localize('vscode/editorStatus/pickAction', 'Select Action') });
|
|
222
223
|
}
|
|
223
224
|
|
|
224
225
|
protected newConfigEolHandler(): MonacoEditorCommandHandler {
|
|
@@ -234,7 +235,7 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
234
235
|
execute: () => this.setEol(editor, lineEnding)
|
|
235
236
|
})
|
|
236
237
|
);
|
|
237
|
-
this.quickInputService?.showQuickPick(items, { placeholder: 'Select End of Line Sequence' });
|
|
238
|
+
this.quickInputService?.showQuickPick(items, { placeholder: nls.localize('vscode/editorStatus/selectEOL', 'Select End of Line Sequence') });
|
|
238
239
|
}
|
|
239
240
|
|
|
240
241
|
protected setEol(editor: MonacoEditor, lineEnding: string): void {
|
|
@@ -260,7 +261,7 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
260
261
|
const sizes = Array.from(Array(8), (_, x) => x + 1);
|
|
261
262
|
const tabSizeOptions = sizes.map(size =>
|
|
262
263
|
({
|
|
263
|
-
label: size === tabSize ?
|
|
264
|
+
label: size === tabSize ? size + ' ' + nls.localize('vscode/indentation/configuredTabSize', 'Configured Tab Size') : size.toString(),
|
|
264
265
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
265
266
|
execute: () => model.updateOptions({
|
|
266
267
|
tabSize: size || tabSize,
|
|
@@ -268,27 +269,40 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
268
269
|
})
|
|
269
270
|
})
|
|
270
271
|
);
|
|
271
|
-
this.quickInputService?.showQuickPick(tabSizeOptions, { placeholder: 'Select Tab Size for Current File' });
|
|
272
|
+
this.quickInputService?.showQuickPick(tabSizeOptions, { placeholder: nls.localize('vscode/indentation/selectTabWidth', 'Select Tab Size for Current File') });
|
|
272
273
|
}
|
|
273
274
|
}
|
|
274
275
|
|
|
276
|
+
protected newRevertActiveEditorHandler(): MonacoEditorCommandHandler {
|
|
277
|
+
return {
|
|
278
|
+
execute: () => this.revertEditor(this.getActiveEditor().editor),
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
|
|
275
282
|
protected newRevertAndCloseActiveEditorHandler(): MonacoEditorCommandHandler {
|
|
276
283
|
return {
|
|
277
|
-
execute: async () => this.revertAndCloseActiveEditor()
|
|
284
|
+
execute: async () => this.revertAndCloseActiveEditor(this.getActiveEditor())
|
|
278
285
|
};
|
|
279
286
|
}
|
|
280
287
|
|
|
281
|
-
protected
|
|
282
|
-
const
|
|
288
|
+
protected getActiveEditor(): { widget?: EditorWidget, editor?: MonacoEditor } {
|
|
289
|
+
const widget = this.editorManager.currentEditor;
|
|
290
|
+
return { widget, editor: widget && MonacoEditor.getCurrent(this.editorManager) };
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
protected async revertEditor(editor?: MonacoEditor): Promise<void> {
|
|
283
294
|
if (editor) {
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
295
|
+
return editor.document.revert();
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
protected async revertAndCloseActiveEditor(current: { widget?: EditorWidget, editor?: MonacoEditor }): Promise<void> {
|
|
300
|
+
if (current.editor && current.widget) {
|
|
301
|
+
try {
|
|
302
|
+
await this.revertEditor(current.editor);
|
|
303
|
+
current.widget.close();
|
|
304
|
+
} catch (error) {
|
|
305
|
+
await this.shell.closeWidget(current.widget.id, { save: false });
|
|
292
306
|
}
|
|
293
307
|
}
|
|
294
308
|
}
|
|
@@ -14,14 +14,13 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import { Position } from '@theia/core/shared/vscode-languageserver-types';
|
|
17
|
+
import { Position, Range } from '@theia/core/shared/vscode-languageserver-types';
|
|
18
18
|
import { TextDocumentSaveReason, TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
19
19
|
import { TextEditorDocument, EncodingMode, FindMatchesOptions, FindMatch, EditorPreferences, DEFAULT_WORD_SEPARATORS } from '@theia/editor/lib/browser';
|
|
20
20
|
import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
|
|
21
21
|
import { Emitter, Event } from '@theia/core/lib/common/event';
|
|
22
22
|
import { CancellationTokenSource, CancellationToken } from '@theia/core/lib/common/cancellation';
|
|
23
23
|
import { Resource, ResourceError, ResourceVersion } from '@theia/core/lib/common/resource';
|
|
24
|
-
import { Range } from '@theia/core/shared/vscode-languageserver-types';
|
|
25
24
|
import { Saveable, SaveOptions } from '@theia/core/lib/browser/saveable';
|
|
26
25
|
import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
|
|
27
26
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
@@ -19,7 +19,7 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
19
19
|
import { EditorPreferenceChange, EditorPreferences, TextEditor, DiffNavigator } from '@theia/editor/lib/browser';
|
|
20
20
|
import { DiffUris } from '@theia/core/lib/browser/diff-uris';
|
|
21
21
|
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
22
|
-
import { DisposableCollection, deepClone, Disposable
|
|
22
|
+
import { DisposableCollection, deepClone, Disposable } from '@theia/core/lib/common';
|
|
23
23
|
import { TextDocumentSaveReason } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
24
24
|
import { MonacoCommandServiceFactory } from './monaco-command-service';
|
|
25
25
|
import { MonacoContextMenuService } from './monaco-context-menu';
|
|
@@ -86,7 +86,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
|
86
86
|
bind(MonacoLanguages).toSelf().inSingletonScope();
|
|
87
87
|
rebind(LanguageService).toService(MonacoLanguages);
|
|
88
88
|
bind(WorkspaceSymbolCommand).toSelf().inSingletonScope();
|
|
89
|
-
for (const identifier of [CommandContribution, KeybindingContribution, QuickAccessContribution]) {
|
|
89
|
+
for (const identifier of [CommandContribution, KeybindingContribution, MenuContribution, QuickAccessContribution]) {
|
|
90
90
|
bind(identifier).toService(WorkspaceSymbolCommand);
|
|
91
91
|
}
|
|
92
92
|
|
|
@@ -14,16 +14,14 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-types';
|
|
17
|
+
import { Diagnostic, SymbolInformation } from '@theia/core/shared/vscode-languageserver-types';
|
|
18
18
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
19
19
|
import { ProblemManager } from '@theia/markers/lib/browser/problem/problem-manager';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
|
-
import { Mutable } from '@theia/core/lib/common/types';
|
|
21
|
+
import { MaybePromise, Mutable } from '@theia/core/lib/common/types';
|
|
22
22
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
23
|
-
import { MaybePromise } from '@theia/core/lib/common/types';
|
|
24
23
|
import { CancellationToken } from '@theia/core/lib/common/cancellation';
|
|
25
24
|
import { WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
26
|
-
import { SymbolInformation } from '@theia/core/shared/vscode-languageserver-types';
|
|
27
25
|
import { Language, LanguageService } from '@theia/core/lib/browser/language-service';
|
|
28
26
|
import { MonacoDiagnosticCollection } from './monaco-diagnostic-collection';
|
|
29
27
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
18
18
|
|
|
19
|
-
import { nls } from '@theia/core/lib/
|
|
19
|
+
import { nls } from '@theia/core/lib/common/nls';
|
|
20
20
|
|
|
21
21
|
export function loadVsRequire(context: any): Promise<any> {
|
|
22
22
|
// Monaco uses a custom amd loader that over-rides node's require.
|
|
@@ -48,11 +48,15 @@ export function loadVsRequire(context: any): Promise<any> {
|
|
|
48
48
|
|
|
49
49
|
export function loadMonaco(vsRequire: any): Promise<void> {
|
|
50
50
|
return new Promise<void>(resolve => {
|
|
51
|
-
if (nls.locale
|
|
51
|
+
if (nls.locale) {
|
|
52
52
|
vsRequire.config({
|
|
53
53
|
'vs/nls': {
|
|
54
54
|
availableLanguages: {
|
|
55
55
|
'*': nls.locale
|
|
56
|
+
},
|
|
57
|
+
loadBundle: (_name: string, _language: string, callback: (err: unknown, messages: Record<string, string[]>) => void) => {
|
|
58
|
+
// The `monaco-nls.json` is build using the `translate-monaco.js` script file
|
|
59
|
+
callback(undefined, createMessageBundle(require('../../data/monaco-nls.json')));
|
|
56
60
|
}
|
|
57
61
|
}
|
|
58
62
|
});
|
|
@@ -162,3 +166,28 @@ export function clearMonacoQuickAccessProviders(): void {
|
|
|
162
166
|
// Clear Monaco QuickAccessRegistry as it currently includes monaco internal providers and not Theia's providers
|
|
163
167
|
registry.clear();
|
|
164
168
|
}
|
|
169
|
+
|
|
170
|
+
function createMessageBundle(bundle: Record<string, Record<string, string>>): Record<string, string[]> {
|
|
171
|
+
const result: Record<string, string[]> = {};
|
|
172
|
+
for (const [fullName, items] of Object.entries(bundle)) {
|
|
173
|
+
const nameIndex = fullName.lastIndexOf('/');
|
|
174
|
+
let name = fullName;
|
|
175
|
+
if (nameIndex >= 0) {
|
|
176
|
+
name = fullName.substring(nameIndex + 1);
|
|
177
|
+
}
|
|
178
|
+
const array: string[] = [];
|
|
179
|
+
const keys = Object.keys(items);
|
|
180
|
+
for (let i = 0; i < keys.length; i++) {
|
|
181
|
+
let key = keys[i];
|
|
182
|
+
if (key.startsWith('_duplicate/')) {
|
|
183
|
+
const index = Number(key.substring('_duplicate/'.length));
|
|
184
|
+
key = keys[index];
|
|
185
|
+
keys[i] = key;
|
|
186
|
+
}
|
|
187
|
+
const fullItemName = `vscode/${name}/${key}`;
|
|
188
|
+
array.push(nls.localize(fullItemName, items[key]));
|
|
189
|
+
}
|
|
190
|
+
result[fullName] = array;
|
|
191
|
+
}
|
|
192
|
+
return result;
|
|
193
|
+
}
|
|
@@ -16,8 +16,9 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
18
18
|
import { MenuContribution, MenuModelRegistry, MAIN_MENU_BAR, MenuPath } from '@theia/core/lib/common';
|
|
19
|
-
import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
|
|
19
|
+
import { EditorMainMenu, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
|
|
20
20
|
import { MonacoCommandRegistry } from './monaco-command-registry';
|
|
21
|
+
import { nls } from '@theia/core/lib/common/nls';
|
|
21
22
|
import MenuRegistry = monaco.actions.MenuRegistry;
|
|
22
23
|
|
|
23
24
|
export interface MonacoActionGroup {
|
|
@@ -27,6 +28,7 @@ export interface MonacoActionGroup {
|
|
|
27
28
|
export namespace MonacoMenus {
|
|
28
29
|
export const SELECTION = [...MAIN_MENU_BAR, '3_selection'];
|
|
29
30
|
export const PEEK_CONTEXT_SUBMENU: MenuPath = [...EDITOR_CONTEXT_MENU, 'navigation', 'peek_submenu'];
|
|
31
|
+
export const MARKERS_GROUP = [...EditorMainMenu.GO, '5_markers_group'];
|
|
30
32
|
}
|
|
31
33
|
|
|
32
34
|
@injectable()
|
|
@@ -50,7 +52,7 @@ export class MonacoEditorMenuContribution implements MenuContribution {
|
|
|
50
52
|
|
|
51
53
|
this.registerPeekSubmenu(registry);
|
|
52
54
|
|
|
53
|
-
registry.registerSubmenu(MonacoMenus.SELECTION, 'Selection');
|
|
55
|
+
registry.registerSubmenu(MonacoMenus.SELECTION, nls.localize('vscode/menubar/mSelection', 'Selection'));
|
|
54
56
|
for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.MenubarSelectionMenu)) {
|
|
55
57
|
if (!monaco.actions.isIMenuItem(item)) {
|
|
56
58
|
continue;
|
|
@@ -64,10 +66,54 @@ export class MonacoEditorMenuContribution implements MenuContribution {
|
|
|
64
66
|
registry.registerMenuAction(menuPath, { commandId, order, label });
|
|
65
67
|
}
|
|
66
68
|
}
|
|
69
|
+
|
|
70
|
+
// Builtin monaco language features commands.
|
|
71
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
72
|
+
commandId: 'editor.action.quickOutline',
|
|
73
|
+
label: nls.localize('vscode/gotoSymbolQuickAccess/gotoSymbol', 'Go to Symbol in Editor...'),
|
|
74
|
+
order: '1'
|
|
75
|
+
});
|
|
76
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
77
|
+
commandId: 'editor.action.revealDefinition',
|
|
78
|
+
order: '2'
|
|
79
|
+
});
|
|
80
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
81
|
+
commandId: 'editor.action.revealDeclaration',
|
|
82
|
+
order: '3'
|
|
83
|
+
});
|
|
84
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
85
|
+
commandId: 'editor.action.goToTypeDefinition',
|
|
86
|
+
order: '4'
|
|
87
|
+
});
|
|
88
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
89
|
+
commandId: 'editor.action.goToImplementation',
|
|
90
|
+
order: '5'
|
|
91
|
+
});
|
|
92
|
+
registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
|
|
93
|
+
commandId: 'editor.action.goToReferences',
|
|
94
|
+
order: '6'
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
registry.registerMenuAction(EditorMainMenu.LOCATION_GROUP, {
|
|
98
|
+
commandId: 'editor.action.jumpToBracket',
|
|
99
|
+
order: '2'
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
// Builtin monaco problem commands.
|
|
103
|
+
registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
|
|
104
|
+
commandId: 'editor.action.marker.nextInFiles',
|
|
105
|
+
label: nls.localize('vscode/gotoError/miGotoNextProblem', 'Next Problem'),
|
|
106
|
+
order: '1'
|
|
107
|
+
});
|
|
108
|
+
registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
|
|
109
|
+
commandId: 'editor.action.marker.prevInFiles',
|
|
110
|
+
label: nls.localize('vscode/gotoError/miGotoPreviousProblem', 'Previous Problem'),
|
|
111
|
+
order: '2'
|
|
112
|
+
});
|
|
67
113
|
}
|
|
68
114
|
|
|
69
115
|
protected registerPeekSubmenu(registry: MenuModelRegistry): void {
|
|
70
|
-
registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, 'Peek');
|
|
116
|
+
registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, nls.localize('vscode/goToCommands/peek.submenu', 'Peek'));
|
|
71
117
|
|
|
72
118
|
for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.EditorContextPeek)) {
|
|
73
119
|
if (!monaco.actions.isIMenuItem(item)) {
|
|
@@ -99,6 +99,13 @@
|
|
|
99
99
|
font-family: sans-serif;
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
+
.monaco-editor .monaco-list .monaco-list-row.focused,
|
|
103
|
+
.monaco-editor .monaco-list .monaco-list-row.focused,
|
|
104
|
+
.monaco-editor .monaco-list .monaco-list-row.focused .suggest-icon {
|
|
105
|
+
color: var(--theia-list-activeSelectionForeground) !important;
|
|
106
|
+
background-color: var(--theia-list-activeSelectionBackground) !important;
|
|
107
|
+
}
|
|
108
|
+
|
|
102
109
|
/* Monaco Quick Input */
|
|
103
110
|
.quick-input-widget {
|
|
104
111
|
width: 600px !important;
|
|
@@ -221,3 +228,11 @@
|
|
|
221
228
|
.monaco-editor .find-widget .matchesCount {
|
|
222
229
|
font-family: var(--theia-ui-font-family);
|
|
223
230
|
}
|
|
231
|
+
|
|
232
|
+
.monaco-editor .monaco-action-bar .action-label.codicon {
|
|
233
|
+
color: var(--theia-foreground);
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
.monaco-editor .monaco-action-bar .action-item.active {
|
|
237
|
+
transform: none;
|
|
238
|
+
}
|