@theia/monaco 1.43.0 → 1.44.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/lib/browser/monaco-command.d.ts.map +1 -1
- package/lib/browser/monaco-command.js +1 -0
- package/lib/browser/monaco-command.js.map +1 -1
- package/lib/browser/monaco-languages.d.ts +8 -1
- package/lib/browser/monaco-languages.d.ts.map +1 -1
- package/lib/browser/monaco-languages.js +55 -1
- package/lib/browser/monaco-languages.js.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.d.ts.map +1 -1
- package/lib/browser/monaco-status-bar-contribution.js +2 -1
- package/lib/browser/monaco-status-bar-contribution.js.map +1 -1
- package/lib/browser/monaco-text-model-service.d.ts.map +1 -1
- package/lib/browser/monaco-text-model-service.js +6 -1
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/monaco-command.ts +6 -4
- package/src/browser/monaco-languages.ts +60 -3
- package/src/browser/monaco-status-bar-contribution.ts +2 -1
- package/src/browser/monaco-text-model-service.ts +6 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAO9I,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAMzB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAK1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAsDxC,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAU/C,SAAS,CAAC,uBAAuB,IAAI,0BAA0B;IAa/D,SAAS,CAAC,2BAA2B,IAAI,0BAA0B;IAKnE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQ1D,SAAS,CAAC,mBAAmB,IAAI,0BAA0B;IAM3D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAWhE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,0BAA0B;IAKjF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAO9I,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAMzB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAK1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAsDxC,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAU/C,SAAS,CAAC,uBAAuB,IAAI,0BAA0B;IAa/D,SAAS,CAAC,2BAA2B,IAAI,0BAA0B;IAKnE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQ1D,SAAS,CAAC,mBAAmB,IAAI,0BAA0B;IAM3D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAWhE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,0BAA0B;IAKjF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAqB1E,SAAS,CAAC,4BAA4B,IAAI,0BAA0B;IAMpE,SAAS,CAAC,oCAAoC,IAAI,0BAA0B;IAM5E,SAAS,CAAC,eAAe,IAAI;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE;cAK7D,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAMlD,0BAA0B,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvH"}
|
|
@@ -226,6 +226,7 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
|
|
|
226
226
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
227
227
|
execute: () => model.updateOptions({
|
|
228
228
|
tabSize: size || tabSize,
|
|
229
|
+
indentSize: size || tabSize,
|
|
229
230
|
insertSpaces: useSpaces
|
|
230
231
|
})
|
|
231
232
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,10 @@ export interface WorkspaceSymbolProvider {
|
|
|
12
12
|
provideWorkspaceSymbols(params: WorkspaceSymbolParams, token: CancellationToken): MaybePromise<SymbolInformation[] | undefined>;
|
|
13
13
|
resolveWorkspaceSymbol?(symbol: SymbolInformation, token: CancellationToken): Thenable<SymbolInformation | undefined>;
|
|
14
14
|
}
|
|
15
|
-
export declare class MonacoLanguages
|
|
15
|
+
export declare class MonacoLanguages extends LanguageService {
|
|
16
16
|
readonly workspaceSymbolProviders: WorkspaceSymbolProvider[];
|
|
17
17
|
protected readonly markers: Map<string, MonacoMarkerCollection>;
|
|
18
|
+
protected readonly icons: Map<string, string>;
|
|
18
19
|
protected readonly problemManager: ProblemManager;
|
|
19
20
|
protected readonly p2m: ProtocolToMonacoConverter;
|
|
20
21
|
protected init(): void;
|
|
@@ -23,7 +24,13 @@ export declare class MonacoLanguages implements LanguageService {
|
|
|
23
24
|
registerWorkspaceSymbolProvider(provider: WorkspaceSymbolProvider): Disposable;
|
|
24
25
|
get languages(): Language[];
|
|
25
26
|
getLanguage(languageId: string): Language | undefined;
|
|
27
|
+
detectLanguage(obj: unknown): Language | undefined;
|
|
28
|
+
protected detectLanguageByIdOrName(obj: string): Language | undefined;
|
|
29
|
+
protected detectLanguageByURI(uri: URI): Language | undefined;
|
|
26
30
|
getExtension(languageId: string): string | undefined;
|
|
31
|
+
registerIcon(languageId: string, iconClass: string): Disposable;
|
|
32
|
+
getIcon(obj: unknown): string | undefined;
|
|
33
|
+
getLanguageIdByLanguageName(languageName: string): string | undefined;
|
|
27
34
|
protected mergeLanguages(registered: monaco.languages.ILanguageExtensionPoint[]): Map<string, Mutable<Language>>;
|
|
28
35
|
}
|
|
29
36
|
//# sourceMappingURL=monaco-languages.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-languages.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-languages.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE7G,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-languages.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-languages.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE7G,OAAO,EAAE,cAAc,EAAE,MAAM,oDAAoD,CAAC;AACpF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAMpD,MAAM,WAAW,uBAAuB;IACpC,uBAAuB,CAAC,MAAM,EAAE,qBAAqB,EAAE,KAAK,EAAE,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,EAAE,GAAG,SAAS,CAAC,CAAC;IAChI,sBAAsB,CAAC,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAA;CACxH;AAED,qBACa,eAAgB,SAAQ,eAAe;IAEhD,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAM;IAElE,SAAS,CAAC,QAAQ,CAAC,OAAO,sCAA6C;IACvE,SAAS,CAAC,QAAQ,CAAC,KAAK,sBAA6B;IAE7B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGrF,SAAS,CAAC,IAAI,IAAI,IAAI;IAKtB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAQ7B,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI;IAQzD,+BAA+B,CAAC,QAAQ,EAAE,uBAAuB,GAAG,UAAU;IAU9E,IAAa,SAAS,IAAI,QAAQ,EAAE,CAEnC;IAEQ,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAIrD,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS;IAmB3D,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAUrE,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,GAAG,SAAS;IAK7D,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU;IAS/D,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IAKlD,2BAA2B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIrE,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAgCnH"}
|
|
@@ -29,13 +29,20 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
29
29
|
const problem_manager_1 = require("@theia/markers/lib/browser/problem/problem-manager");
|
|
30
30
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
31
31
|
const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
32
|
+
const language_service_1 = require("@theia/core/lib/browser/language-service");
|
|
32
33
|
const monaco_marker_collection_1 = require("./monaco-marker-collection");
|
|
33
34
|
const protocol_to_monaco_converter_1 = require("./protocol-to-monaco-converter");
|
|
34
35
|
const monaco = require("@theia/monaco-editor-core");
|
|
35
|
-
|
|
36
|
+
const files_1 = require("@theia/filesystem/lib/common/files");
|
|
37
|
+
const browser_1 = require("@theia/filesystem/lib/browser");
|
|
38
|
+
const language_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/languages/language");
|
|
39
|
+
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
40
|
+
let MonacoLanguages = class MonacoLanguages extends language_service_1.LanguageService {
|
|
36
41
|
constructor() {
|
|
42
|
+
super(...arguments);
|
|
37
43
|
this.workspaceSymbolProviders = [];
|
|
38
44
|
this.markers = new Map();
|
|
45
|
+
this.icons = new Map();
|
|
39
46
|
}
|
|
40
47
|
init() {
|
|
41
48
|
this.problemManager.onDidChangeMarkers(uri => this.updateMarkers(uri));
|
|
@@ -70,10 +77,57 @@ let MonacoLanguages = class MonacoLanguages {
|
|
|
70
77
|
getLanguage(languageId) {
|
|
71
78
|
return this.mergeLanguages(monaco.languages.getLanguages().filter(language => language.id === languageId)).get(languageId);
|
|
72
79
|
}
|
|
80
|
+
detectLanguage(obj) {
|
|
81
|
+
var _a;
|
|
82
|
+
if (obj === undefined) {
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
if (typeof obj === 'string') {
|
|
86
|
+
return (_a = this.detectLanguageByIdOrName(obj)) !== null && _a !== void 0 ? _a : this.detectLanguageByURI(new uri_1.default(obj));
|
|
87
|
+
}
|
|
88
|
+
if (obj instanceof uri_1.default) {
|
|
89
|
+
return this.detectLanguageByURI(obj);
|
|
90
|
+
}
|
|
91
|
+
if (files_1.FileStat.is(obj)) {
|
|
92
|
+
return this.detectLanguageByURI(obj.resource);
|
|
93
|
+
}
|
|
94
|
+
if (browser_1.FileStatNode.is(obj)) {
|
|
95
|
+
return this.detectLanguageByURI(obj.uri);
|
|
96
|
+
}
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
detectLanguageByIdOrName(obj) {
|
|
100
|
+
const languageById = this.getLanguage(obj);
|
|
101
|
+
if (languageById) {
|
|
102
|
+
return languageById;
|
|
103
|
+
}
|
|
104
|
+
const languageId = this.getLanguageIdByLanguageName(obj);
|
|
105
|
+
return languageId ? this.getLanguage(languageId) : undefined;
|
|
106
|
+
}
|
|
107
|
+
detectLanguageByURI(uri) {
|
|
108
|
+
const languageId = standaloneServices_1.StandaloneServices.get(language_1.ILanguageService).guessLanguageIdByFilepathOrFirstLine(uri['codeUri']);
|
|
109
|
+
return languageId ? this.getLanguage(languageId) : undefined;
|
|
110
|
+
}
|
|
73
111
|
getExtension(languageId) {
|
|
74
112
|
var _a;
|
|
75
113
|
return (_a = this.getLanguage(languageId)) === null || _a === void 0 ? void 0 : _a.extensions.values().next().value;
|
|
76
114
|
}
|
|
115
|
+
registerIcon(languageId, iconClass) {
|
|
116
|
+
this.icons.set(languageId, iconClass);
|
|
117
|
+
this.onDidChangeIconEmitter.fire({ languageId });
|
|
118
|
+
return disposable_1.Disposable.create(() => {
|
|
119
|
+
this.icons.delete(languageId);
|
|
120
|
+
this.onDidChangeIconEmitter.fire({ languageId });
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
getIcon(obj) {
|
|
124
|
+
const language = this.detectLanguage(obj);
|
|
125
|
+
return language ? this.icons.get(language.id) : undefined;
|
|
126
|
+
}
|
|
127
|
+
getLanguageIdByLanguageName(languageName) {
|
|
128
|
+
var _a;
|
|
129
|
+
return (_a = monaco.languages.getLanguages().find(language => { var _a; return (_a = language.aliases) === null || _a === void 0 ? void 0 : _a.includes(languageName); })) === null || _a === void 0 ? void 0 : _a.id;
|
|
130
|
+
}
|
|
77
131
|
mergeLanguages(registered) {
|
|
78
132
|
const languages = new Map();
|
|
79
133
|
for (const { id, aliases, extensions, filenames } of registered) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-languages.js","sourceRoot":"","sources":["../../src/browser/monaco-languages.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;AAGhF,4DAAiF;AACjF,wFAAoF;AACpF,oDAA6C;AAE7C,kEAA+D;
|
|
1
|
+
{"version":3,"file":"monaco-languages.js","sourceRoot":"","sources":["../../src/browser/monaco-languages.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-status-bar-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-status-bar-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,SAAS,EAAsB,MAAM,yBAAyB,CAAC;AAC9H,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAExF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBACa,2BAA4B,YAAW,+BAA+B;IAKpD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAJ9D,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;gBAGZ,aAAa,EAAE,aAAa,EAChC,SAAS,EAAE,SAAS;IAG9D,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAKvC,SAAS,CAAC,eAAe,IAAI,IAAI;IAyBjC,SAAS,CAAC,sBAAsB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"monaco-status-bar-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-status-bar-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAO,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,SAAS,EAAsB,MAAM,yBAAyB,CAAC;AAC9H,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAExF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBACa,2BAA4B,YAAW,+BAA+B;IAKpD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IACnD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAJ9D,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;gBAGZ,aAAa,EAAE,aAAa,EAChC,SAAS,EAAE,SAAS;IAG9D,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAKvC,SAAS,CAAC,eAAe,IAAI,IAAI;IAyBjC,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAmBxC,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAI3C,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAerC,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAIxC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS;CAI7F"}
|
|
@@ -73,8 +73,9 @@ let MonacoStatusBarContribution = class MonacoStatusBarContribution {
|
|
|
73
73
|
if (editor && editorModel) {
|
|
74
74
|
const modelOptions = editorModel.getOptions();
|
|
75
75
|
const tabSize = modelOptions.tabSize;
|
|
76
|
+
const indentSize = modelOptions.indentSize;
|
|
76
77
|
const spaceOrTabSizeMessage = modelOptions.insertSpaces
|
|
77
|
-
? core_1.nls.localizeByDefault('Spaces: {0}',
|
|
78
|
+
? core_1.nls.localizeByDefault('Spaces: {0}', indentSize)
|
|
78
79
|
: core_1.nls.localizeByDefault('Tab Size: {0}', tabSize);
|
|
79
80
|
this.statusBar.setElement('editor-status-tabbing-config', {
|
|
80
81
|
text: spaceOrTabSizeMessage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-status-bar-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-status-bar-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,8BAA8B;AAC9B,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,sCAAwD;AACxD,qDAA8H;AAC9H,uDAAwF;AACxF,mDAA+C;AAI/C,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAIpC,YAC8C,aAA4B,EAChC,SAAoB;QADhB,kBAAa,GAAb,aAAa,CAAe;QAChC,cAAS,GAAT,SAAS,CAAW;QAJ3C,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;IAKtD,CAAC;IAEL,OAAO,CAAC,GAAwB;QAC5B,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAC5E,CAAC;IAES,eAAe;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,WAAW,EAAE;YACvB,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAE3B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACpD,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;gBACnD,IAAI,QAAQ,KAAK,CAAC,CAAC,GAAG,EAAE;oBACpB,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC;oBACjB,IAAI,CAAC,mBAAmB,EAAE,CAAC;iBAC9B;YACL,CAAC,CAAC,CAAC,CAAC;SACP;aAAM;YACH,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACjC,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACjC;IACL,CAAC;IAES,sBAAsB;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,WAAW,EAAE;YACvB,MAAM,YAAY,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;YACrC,MAAM,qBAAqB,GAAG,YAAY,CAAC,YAAY;gBACnD,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"monaco-status-bar-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-status-bar-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,8BAA8B;AAC9B,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,sCAAwD;AACxD,qDAA8H;AAC9H,uDAAwF;AACxF,mDAA+C;AAI/C,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAIpC,YAC8C,aAA4B,EAChC,SAAoB;QADhB,kBAAa,GAAb,aAAa,CAAe;QAChC,cAAS,GAAT,SAAS,CAAW;QAJ3C,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;IAKtD,CAAC;IAEL,OAAO,CAAC,GAAwB;QAC5B,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAC5E,CAAC;IAES,eAAe;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,WAAW,EAAE;YACvB,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAE3B,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACpD,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;gBACnD,IAAI,QAAQ,KAAK,CAAC,CAAC,GAAG,EAAE;oBACpB,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC;oBACjB,IAAI,CAAC,mBAAmB,EAAE,CAAC;iBAC9B;YACL,CAAC,CAAC,CAAC,CAAC;SACP;aAAM;YACH,IAAI,CAAC,yBAAyB,EAAE,CAAC;YACjC,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACjC;IACL,CAAC;IAES,sBAAsB;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,WAAW,EAAE;YACvB,MAAM,YAAY,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;YACrC,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;YAC3C,MAAM,qBAAqB,GAAG,YAAY,CAAC,YAAY;gBACnD,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC;gBAClD,CAAC,CAAC,UAAG,CAAC,iBAAiB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,8BAA8B,EAAE;gBACtD,IAAI,EAAE,qBAAqB;gBAC3B,SAAS,EAAE,4BAAkB,CAAC,KAAK;gBACnC,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,wBAAc,CAAC,kBAAkB,CAAC,EAAE;gBAC7C,OAAO,EAAE,UAAG,CAAC,iBAAiB,CAAC,oBAAoB,CAAC;aACvD,CAAC,CAAC;SACN;IACL,CAAC;IACS,yBAAyB;QAC/B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,8BAA8B,CAAC,CAAC;IACjE,CAAC;IAES,mBAAmB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,IAAI,WAAW,EAAE;YACvB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,mBAAmB,EAAE;gBAC3C,IAAI,EAAE,GAAG,IAAI,EAAE;gBACf,SAAS,EAAE,4BAAkB,CAAC,KAAK;gBACnC,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,wBAAc,CAAC,UAAU,CAAC,EAAE;gBACrC,OAAO,EAAE,UAAG,CAAC,iBAAiB,CAAC,6BAA6B,CAAC;aAChE,CAAC,CAAC;SACN;IACL,CAAC;IACS,sBAAsB;QAC5B,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;IACtD,CAAC;IAES,QAAQ,CAAC,MAAgC;QAC/C,MAAM,YAAY,GAAG,4BAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO,YAAY,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,IAAI,SAAS,CAAC;IAC7E,CAAC;CACJ,CAAA;AArFY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAMJ,WAAA,IAAA,kBAAM,EAAC,uBAAa,CAAC,CAAA;IACrB,WAAA,IAAA,kBAAM,EAAC,mBAAS,CAAC,CAAA;qCADuC,uBAAa;GALjE,2BAA2B,CAqFvC;AArFY,kEAA2B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-text-model-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,oBAAoB,EAAM,MAAM,aAAa,CAAC;AAC7H,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACvI,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAIzE,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,WAAW,wBAAwB;IAErC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,WAAW,CACP,QAAQ,EAAE,QAAQ,GACnB,YAAY,CAAC,iBAAiB,CAAC,CAAC;CAEtC;AAED,qBACa,sBAAuB,YAAW,iBAAiB;IAC5D,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAqB;IAElD,SAAS,CAAC,QAAQ,CAAC,OAAO,iDAExB;IAGF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAIlD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;IAG7E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,IAAI,IAAI,IAAI;IActB,IAAI,MAAM,IAAI,iBAAiB,EAAE,CAEhC;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAI/C,IAAI,WAAW,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAE1C;IAED,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;cAInE,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAW/D,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAK1E,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC,CAAA;KAAE,
|
|
1
|
+
{"version":3,"file":"monaco-text-model-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,oBAAoB,EAAM,MAAM,aAAa,CAAC;AAC7H,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,yEAAyE,CAAC;AACvI,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAIzE,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,WAAW,wBAAwB;IAErC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,WAAW,CACP,QAAQ,EAAE,QAAQ,GACnB,YAAY,CAAC,iBAAiB,CAAC,CAAC;CAEtC;AAED,qBACa,sBAAuB,YAAW,iBAAiB;IAC5D,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAqB;IAElD,SAAS,CAAC,QAAQ,CAAC,OAAO,iDAExB;IAGF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAIlD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;IAG7E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAG5C,SAAS,CAAC,IAAI,IAAI,IAAI;IActB,IAAI,MAAM,IAAI,iBAAiB,EAAE,CAEhC;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAI/C,IAAI,WAAW,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAE1C;IAED,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;cAInE,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAW/D,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,CAAC,iBAAiB,CAAC;IAK1E,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,uBAAuB,GAAG,SAAS,CAAC,CAAA;KAAE,CAI9F;IAEF,SAAS,CAAC,aAAa,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,MAAM,uBAAuB,GAAG,SAAS;IAe9H,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,sBAAsB,GAAG,IAAI;IAmBtF,kDAAkD;IAClD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB;IAC/D,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,iBAAiB,GAAG,uBAAuB;IAkB5E,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAyB,GAAG,WAAW;IAQlG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,GAAG,OAAO;CAGnD"}
|
|
@@ -48,7 +48,8 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
48
48
|
this._models = new core_1.ReferenceCollection(uri => this.loadModel(new uri_1.default(uri)));
|
|
49
49
|
this.modelOptions = {
|
|
50
50
|
'editor.tabSize': 'tabSize',
|
|
51
|
-
'editor.insertSpaces': 'insertSpaces'
|
|
51
|
+
'editor.insertSpaces': 'insertSpaces',
|
|
52
|
+
'editor.indentSize': 'indentSize'
|
|
52
53
|
};
|
|
53
54
|
}
|
|
54
55
|
init() {
|
|
@@ -92,6 +93,8 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
92
93
|
toModelOption(editorPreference) {
|
|
93
94
|
switch (editorPreference) {
|
|
94
95
|
case 'editor.tabSize': return 'tabSize';
|
|
96
|
+
// @monaco-uplift: uncomment this line once 'editor.indentSize' preference is available
|
|
97
|
+
// case 'editor.indentSize': return 'indentSize';
|
|
95
98
|
case 'editor.insertSpaces': return 'insertSpaces';
|
|
96
99
|
case 'editor.bracketPairColorization.enabled':
|
|
97
100
|
case 'editor.bracketPairColorization.independentColorPoolPerBracketType':
|
|
@@ -124,6 +127,8 @@ let MonacoTextModelService = class MonacoTextModelService {
|
|
|
124
127
|
const overrideIdentifier = typeof arg === 'string' ? undefined : arg.languageId;
|
|
125
128
|
return {
|
|
126
129
|
tabSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
|
|
130
|
+
// @monaco-uplift: when available, switch to 'editor.indentSize' preference.
|
|
131
|
+
indentSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
|
|
127
132
|
insertSpaces: this.editorPreferences.get({ preferenceName: 'editor.insertSpaces', overrideIdentifier }, undefined, uri),
|
|
128
133
|
bracketColorizationOptions: {
|
|
129
134
|
enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;AAEhF,4DAAwF;AACxF,oDAA6C;AAC7C,sCAA6H;AAC7H,uDAAsF;AACtF,+DAA0D;AAE1D,iFAA2E;AAC3E,iFAA2E;AAC3E,0DAAwD;AAIxD,6EAAyE;AACzE,sHAAmH;AACnH,iIAAmI;AAEtH,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAY3E,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAAnC;QAGI;;;;WAIG;QACM,UAAK,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;QAE/B,YAAO,GAAG,IAAI,0BAAmB,CAChD,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;QAuEiB,iBAAY,GAAoE;YAC/F,gBAAgB,EAAE,SAAS;YAC3B,qBAAqB,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.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.44.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.44.0",
|
|
7
|
+
"@theia/editor": "1.44.0",
|
|
8
|
+
"@theia/filesystem": "1.44.0",
|
|
9
|
+
"@theia/markers": "1.44.0",
|
|
10
10
|
"@theia/monaco-editor-core": "1.72.3",
|
|
11
|
-
"@theia/outline-view": "1.
|
|
12
|
-
"@theia/workspace": "1.
|
|
11
|
+
"@theia/outline-view": "1.44.0",
|
|
12
|
+
"@theia/workspace": "1.44.0",
|
|
13
13
|
"fast-plist": "^0.1.2",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -50,10 +50,10 @@
|
|
|
50
50
|
"watch": "theiaext watch"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@theia/ext-scripts": "1.
|
|
53
|
+
"@theia/ext-scripts": "1.44.0"
|
|
54
54
|
},
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "46349875c7ff0e58c3c77ffe4eaa53ac74fa97a5"
|
|
59
59
|
}
|
|
@@ -265,10 +265,12 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
|
|
|
265
265
|
({
|
|
266
266
|
label: size === tabSize ? size + ' ' + nls.localizeByDefault('Configured Tab Size') : size.toString(),
|
|
267
267
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
268
|
-
execute: () =>
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
268
|
+
execute: () =>
|
|
269
|
+
model.updateOptions({
|
|
270
|
+
tabSize: size || tabSize,
|
|
271
|
+
indentSize: size || tabSize,
|
|
272
|
+
insertSpaces: useSpaces
|
|
273
|
+
})
|
|
272
274
|
})
|
|
273
275
|
);
|
|
274
276
|
this.quickInputService?.showQuickPick(tabSizeOptions, { placeholder: nls.localizeByDefault('Select Tab Size for Current File') });
|
|
@@ -25,6 +25,10 @@ import { Language, LanguageService } from '@theia/core/lib/browser/language-serv
|
|
|
25
25
|
import { MonacoMarkerCollection } from './monaco-marker-collection';
|
|
26
26
|
import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
|
|
27
27
|
import * as monaco from '@theia/monaco-editor-core';
|
|
28
|
+
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
29
|
+
import { FileStatNode } from '@theia/filesystem/lib/browser';
|
|
30
|
+
import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
|
|
31
|
+
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
28
32
|
|
|
29
33
|
export interface WorkspaceSymbolProvider {
|
|
30
34
|
provideWorkspaceSymbols(params: WorkspaceSymbolParams, token: CancellationToken): MaybePromise<SymbolInformation[] | undefined>;
|
|
@@ -32,11 +36,12 @@ export interface WorkspaceSymbolProvider {
|
|
|
32
36
|
}
|
|
33
37
|
|
|
34
38
|
@injectable()
|
|
35
|
-
export class MonacoLanguages
|
|
39
|
+
export class MonacoLanguages extends LanguageService {
|
|
36
40
|
|
|
37
41
|
readonly workspaceSymbolProviders: WorkspaceSymbolProvider[] = [];
|
|
38
42
|
|
|
39
43
|
protected readonly markers = new Map<string, MonacoMarkerCollection>();
|
|
44
|
+
protected readonly icons = new Map<string, string>();
|
|
40
45
|
|
|
41
46
|
@inject(ProblemManager) protected readonly problemManager: ProblemManager;
|
|
42
47
|
@inject(ProtocolToMonacoConverter) protected readonly p2m: ProtocolToMonacoConverter;
|
|
@@ -73,18 +78,70 @@ export class MonacoLanguages implements LanguageService {
|
|
|
73
78
|
});
|
|
74
79
|
}
|
|
75
80
|
|
|
76
|
-
get languages(): Language[] {
|
|
81
|
+
override get languages(): Language[] {
|
|
77
82
|
return [...this.mergeLanguages(monaco.languages.getLanguages()).values()];
|
|
78
83
|
}
|
|
79
84
|
|
|
80
|
-
getLanguage(languageId: string): Language | undefined {
|
|
85
|
+
override getLanguage(languageId: string): Language | undefined {
|
|
81
86
|
return this.mergeLanguages(monaco.languages.getLanguages().filter(language => language.id === languageId)).get(languageId);
|
|
82
87
|
}
|
|
83
88
|
|
|
89
|
+
override detectLanguage(obj: unknown): Language | undefined {
|
|
90
|
+
if (obj === undefined) {
|
|
91
|
+
return undefined;
|
|
92
|
+
}
|
|
93
|
+
if (typeof obj === 'string') {
|
|
94
|
+
return this.detectLanguageByIdOrName(obj) ?? this.detectLanguageByURI(new URI(obj));
|
|
95
|
+
}
|
|
96
|
+
if (obj instanceof URI) {
|
|
97
|
+
return this.detectLanguageByURI(obj);
|
|
98
|
+
}
|
|
99
|
+
if (FileStat.is(obj)) {
|
|
100
|
+
return this.detectLanguageByURI(obj.resource);
|
|
101
|
+
}
|
|
102
|
+
if (FileStatNode.is(obj)) {
|
|
103
|
+
return this.detectLanguageByURI(obj.uri);
|
|
104
|
+
}
|
|
105
|
+
return undefined;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
protected detectLanguageByIdOrName(obj: string): Language | undefined {
|
|
109
|
+
const languageById = this.getLanguage(obj);
|
|
110
|
+
if (languageById) {
|
|
111
|
+
return languageById;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
const languageId = this.getLanguageIdByLanguageName(obj);
|
|
115
|
+
return languageId ? this.getLanguage(languageId) : undefined;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
protected detectLanguageByURI(uri: URI): Language | undefined {
|
|
119
|
+
const languageId = StandaloneServices.get(ILanguageService).guessLanguageIdByFilepathOrFirstLine(uri['codeUri']);
|
|
120
|
+
return languageId ? this.getLanguage(languageId) : undefined;
|
|
121
|
+
}
|
|
122
|
+
|
|
84
123
|
getExtension(languageId: string): string | undefined {
|
|
85
124
|
return this.getLanguage(languageId)?.extensions.values().next().value;
|
|
86
125
|
}
|
|
87
126
|
|
|
127
|
+
override registerIcon(languageId: string, iconClass: string): Disposable {
|
|
128
|
+
this.icons.set(languageId, iconClass);
|
|
129
|
+
this.onDidChangeIconEmitter.fire({ languageId });
|
|
130
|
+
return Disposable.create(() => {
|
|
131
|
+
this.icons.delete(languageId);
|
|
132
|
+
this.onDidChangeIconEmitter.fire({ languageId });
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
override getIcon(obj: unknown): string | undefined {
|
|
137
|
+
const language = this.detectLanguage(obj);
|
|
138
|
+
return language ? this.icons.get(language.id) : undefined;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
getLanguageIdByLanguageName(languageName: string): string | undefined {
|
|
142
|
+
return monaco.languages.getLanguages().find(language => language.aliases?.includes(languageName))?.id;
|
|
143
|
+
}
|
|
144
|
+
|
|
88
145
|
protected mergeLanguages(registered: monaco.languages.ILanguageExtensionPoint[]): Map<string, Mutable<Language>> {
|
|
89
146
|
const languages = new Map<string, Mutable<Language>>();
|
|
90
147
|
for (const { id, aliases, extensions, filenames } of registered) {
|
|
@@ -67,8 +67,9 @@ export class MonacoStatusBarContribution implements FrontendApplicationContribut
|
|
|
67
67
|
if (editor && editorModel) {
|
|
68
68
|
const modelOptions = editorModel.getOptions();
|
|
69
69
|
const tabSize = modelOptions.tabSize;
|
|
70
|
+
const indentSize = modelOptions.indentSize;
|
|
70
71
|
const spaceOrTabSizeMessage = modelOptions.insertSpaces
|
|
71
|
-
? nls.localizeByDefault('Spaces: {0}',
|
|
72
|
+
? nls.localizeByDefault('Spaces: {0}', indentSize)
|
|
72
73
|
: nls.localizeByDefault('Tab Size: {0}', tabSize);
|
|
73
74
|
this.statusBar.setElement('editor-status-tabbing-config', {
|
|
74
75
|
text: spaceOrTabSizeMessage,
|
|
@@ -127,12 +127,15 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
127
127
|
|
|
128
128
|
protected readonly modelOptions: { [name: string]: (keyof ITextModelUpdateOptions | undefined) } = {
|
|
129
129
|
'editor.tabSize': 'tabSize',
|
|
130
|
-
'editor.insertSpaces': 'insertSpaces'
|
|
130
|
+
'editor.insertSpaces': 'insertSpaces',
|
|
131
|
+
'editor.indentSize': 'indentSize'
|
|
131
132
|
};
|
|
132
133
|
|
|
133
134
|
protected toModelOption(editorPreference: EditorPreferenceChange['preferenceName']): keyof ITextModelUpdateOptions | undefined {
|
|
134
135
|
switch (editorPreference) {
|
|
135
136
|
case 'editor.tabSize': return 'tabSize';
|
|
137
|
+
// @monaco-uplift: uncomment this line once 'editor.indentSize' preference is available
|
|
138
|
+
// case 'editor.indentSize': return 'indentSize';
|
|
136
139
|
case 'editor.insertSpaces': return 'insertSpaces';
|
|
137
140
|
case 'editor.bracketPairColorization.enabled':
|
|
138
141
|
case 'editor.bracketPairColorization.independentColorPoolPerBracketType':
|
|
@@ -170,6 +173,8 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
170
173
|
const overrideIdentifier = typeof arg === 'string' ? undefined : arg.languageId;
|
|
171
174
|
return {
|
|
172
175
|
tabSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
|
|
176
|
+
// @monaco-uplift: when available, switch to 'editor.indentSize' preference.
|
|
177
|
+
indentSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
|
|
173
178
|
insertSpaces: this.editorPreferences.get({ preferenceName: 'editor.insertSpaces', overrideIdentifier }, undefined, uri),
|
|
174
179
|
bracketColorizationOptions: {
|
|
175
180
|
enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri),
|