@theia/monaco 1.45.1 → 1.46.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.
|
@@ -43,12 +43,12 @@ let MonacoFormattingConflictsContribution = class MonacoFormattingConflictsContr
|
|
|
43
43
|
});
|
|
44
44
|
await this.preferenceService.set(name, formatter);
|
|
45
45
|
}
|
|
46
|
-
getDefaultFormatter(language) {
|
|
46
|
+
getDefaultFormatter(language, resourceURI) {
|
|
47
47
|
const name = this.preferenceSchema.overridePreferenceName({
|
|
48
48
|
preferenceName: PREFERENCE_NAME,
|
|
49
49
|
overrideIdentifier: language
|
|
50
50
|
});
|
|
51
|
-
return this.preferenceService.get(name);
|
|
51
|
+
return this.preferenceService.get(name, undefined, resourceURI);
|
|
52
52
|
}
|
|
53
53
|
async selectFormatter(formatters, document, mode) {
|
|
54
54
|
if (formatters.length === 0) {
|
|
@@ -62,7 +62,7 @@ let MonacoFormattingConflictsContribution = class MonacoFormattingConflictsContr
|
|
|
62
62
|
return undefined;
|
|
63
63
|
}
|
|
64
64
|
const languageId = currentEditor.editor.document.languageId;
|
|
65
|
-
const defaultFormatterId = this.getDefaultFormatter(languageId);
|
|
65
|
+
const defaultFormatterId = this.getDefaultFormatter(languageId, document.uri.toString());
|
|
66
66
|
if (defaultFormatterId) {
|
|
67
67
|
const formatter = formatters.find(f => f.extensionId && f.extensionId.value === defaultFormatterId);
|
|
68
68
|
if (formatter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-formatting-conflicts.js","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,qDAAgI;AAChI,uDAA0D;AAC1D,6EAAuE;AAEvE,kGAA4H;AAG5H,oDAAiD;AAIjD,MAAM,eAAe,GAAG,yBAAyB,CAAC;AAGlD,IAAa,qCAAqC,GAAlD,MAAa,qCAAqC;IAc9C,KAAK,CAAC,UAAU;QAEZ,4BAAmB,CAAC,oBAAoB,CAAC,CACrC,UAAe,EAAE,QAAoB,EAAE,IAAoB,EAAE,EAAE,CAC/D,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,SAAiB;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC;YACtD,cAAc,EAAE,eAAe;YAC/B,kBAAkB,EAAE,QAAQ;SAC/B,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAEO,mBAAmB,CAAC,QAAgB;
|
|
1
|
+
{"version":3,"file":"monaco-formatting-conflicts.js","sourceRoot":"","sources":["../../src/browser/monaco-formatting-conflicts.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.46.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.46.0",
|
|
7
|
+
"@theia/editor": "1.46.0",
|
|
8
|
+
"@theia/filesystem": "1.46.0",
|
|
9
|
+
"@theia/markers": "1.46.0",
|
|
10
10
|
"@theia/monaco-editor-core": "1.72.3",
|
|
11
|
-
"@theia/outline-view": "1.
|
|
12
|
-
"@theia/workspace": "1.
|
|
11
|
+
"@theia/outline-view": "1.46.0",
|
|
12
|
+
"@theia/workspace": "1.46.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.46.0"
|
|
54
54
|
},
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "90ba9de68f5912773ae9e26fcffeb671c0ab43d2"
|
|
59
59
|
}
|
|
@@ -59,13 +59,13 @@ export class MonacoFormattingConflictsContribution implements FrontendApplicatio
|
|
|
59
59
|
await this.preferenceService.set(name, formatter);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
private getDefaultFormatter(language: string): string | undefined {
|
|
62
|
+
private getDefaultFormatter(language: string, resourceURI: string): string | undefined {
|
|
63
63
|
const name = this.preferenceSchema.overridePreferenceName({
|
|
64
64
|
preferenceName: PREFERENCE_NAME,
|
|
65
65
|
overrideIdentifier: language
|
|
66
66
|
});
|
|
67
67
|
|
|
68
|
-
return this.preferenceService.get<string>(name);
|
|
68
|
+
return this.preferenceService.get<string>(name, undefined, resourceURI);
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
private async selectFormatter<T extends FormattingEditProvider>(
|
|
@@ -85,7 +85,7 @@ export class MonacoFormattingConflictsContribution implements FrontendApplicatio
|
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
const languageId = currentEditor.editor.document.languageId;
|
|
88
|
-
const defaultFormatterId = this.getDefaultFormatter(languageId);
|
|
88
|
+
const defaultFormatterId = this.getDefaultFormatter(languageId, document.uri.toString());
|
|
89
89
|
|
|
90
90
|
if (defaultFormatterId) {
|
|
91
91
|
const formatter = formatters.find(f => f.extensionId && f.extensionId.value === defaultFormatterId);
|