@opensumi/ide-editor 2.16.6 → 2.16.7-next-1649304413.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/breadcrumb/default.d.ts.map +1 -1
- package/lib/browser/breadcrumb/default.js +4 -4
- package/lib/browser/breadcrumb/default.js.map +1 -1
- package/lib/browser/breadcrumb/document-symbol.js +2 -2
- package/lib/browser/breadcrumb/document-symbol.js.map +1 -1
- package/lib/browser/breadcrumb/index.d.ts.map +1 -1
- package/lib/browser/breadcrumb/index.js +2 -1
- package/lib/browser/breadcrumb/index.js.map +1 -1
- package/lib/browser/component/scroll/scroll.d.ts +1 -65
- package/lib/browser/component/scroll/scroll.d.ts.map +1 -1
- package/lib/browser/component/scroll/scroll.js +1 -262
- package/lib/browser/component/scroll/scroll.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.js +9 -5
- package/lib/browser/doc-model/editor-document-model-service.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model.d.ts +2 -0
- package/lib/browser/doc-model/editor-document-model.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model.js +7 -6
- package/lib/browser/doc-model/editor-document-model.js.map +1 -1
- package/lib/browser/doc-model/saveParticipants.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.js +13 -6
- package/lib/browser/doc-model/saveParticipants.js.map +1 -1
- package/lib/browser/doc-model/types.d.ts +8 -0
- package/lib/browser/doc-model/types.d.ts.map +1 -1
- package/lib/browser/doc-model/types.js.map +1 -1
- package/lib/browser/editor-collection.service.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.js +4 -3
- package/lib/browser/editor-collection.service.js.map +1 -1
- package/lib/browser/editor.contribution.d.ts +4 -0
- package/lib/browser/editor.contribution.d.ts.map +1 -1
- package/lib/browser/editor.contribution.js +39 -9
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.module.less +2 -2
- package/lib/browser/editor.view.d.ts.map +1 -1
- package/lib/browser/editor.view.js +1 -1
- package/lib/browser/editor.view.js.map +1 -1
- package/lib/browser/feature.d.ts.map +1 -1
- package/lib/browser/feature.js +2 -1
- package/lib/browser/feature.js.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.js +6 -7
- package/lib/browser/fs-resource/fs-editor-doc.js.map +1 -1
- package/lib/browser/fs-resource/fs-resource.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-resource.js +13 -19
- package/lib/browser/fs-resource/fs-resource.js.map +1 -1
- package/lib/browser/grid/grid.service.js +3 -3
- package/lib/browser/grid/grid.service.js.map +1 -1
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +0 -2
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/language/language-status.service.d.ts.map +1 -1
- package/lib/browser/language/language-status.service.js +3 -2
- package/lib/browser/language/language-status.service.js.map +1 -1
- package/lib/browser/menu/editor.context.d.ts +13 -12
- package/lib/browser/menu/editor.context.d.ts.map +1 -1
- package/lib/browser/menu/editor.context.js +93 -75
- package/lib/browser/menu/editor.context.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js +6 -2
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.js +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.js.map +1 -1
- package/lib/browser/navigation.module.less +1 -1
- package/lib/browser/navigation.view.js +1 -1
- package/lib/browser/navigation.view.js.map +1 -1
- package/lib/browser/preference/converter.d.ts.map +1 -1
- package/lib/browser/preference/converter.js +4 -3
- package/lib/browser/preference/converter.js.map +1 -1
- package/lib/browser/preference/schema.d.ts.map +1 -1
- package/lib/browser/preference/schema.js +1 -0
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/resource.service.d.ts.map +1 -1
- package/lib/browser/resource.service.js +2 -1
- package/lib/browser/resource.service.js.map +1 -1
- package/lib/browser/tab.view.d.ts.map +1 -1
- package/lib/browser/tab.view.js +1 -1
- package/lib/browser/tab.view.js.map +1 -1
- package/lib/browser/untitled-resource.d.ts +6 -1
- package/lib/browser/untitled-resource.d.ts.map +1 -1
- package/lib/browser/untitled-resource.js +51 -4
- package/lib/browser/untitled-resource.js.map +1 -1
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +7 -9
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/lib/common/editor.d.ts +4 -0
- package/lib/common/editor.d.ts.map +1 -1
- package/lib/common/editor.js.map +1 -1
- package/lib/common/language.d.ts +2 -3
- package/lib/common/language.d.ts.map +1 -1
- package/lib/common/language.js.map +1 -1
- package/lib/common/resource.d.ts +5 -0
- package/lib/common/resource.d.ts.map +1 -1
- package/lib/common/resource.js +7 -1
- package/lib/common/resource.js.map +1 -1
- package/package.json +12 -12
|
@@ -6,19 +6,13 @@ const di_1 = require("@opensumi/di");
|
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
7
|
const services_1 = require("@opensumi/ide-core-browser/lib/services");
|
|
8
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
-
const path_1 = require("@opensumi/ide-core-common/lib/path");
|
|
10
9
|
const common_1 = require("@opensumi/ide-file-service/lib/common");
|
|
11
10
|
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
12
11
|
const common_2 = require("../../common");
|
|
13
12
|
const common_3 = require("../../common");
|
|
14
13
|
const types_1 = require("../doc-model/types");
|
|
15
14
|
const file_tree_set_1 = require("./file-tree-set");
|
|
16
|
-
|
|
17
|
-
(function (AskSaveResult) {
|
|
18
|
-
AskSaveResult[AskSaveResult["REVERT"] = 1] = "REVERT";
|
|
19
|
-
AskSaveResult[AskSaveResult["SAVE"] = 2] = "SAVE";
|
|
20
|
-
AskSaveResult[AskSaveResult["CANCEL"] = 3] = "CANCEL";
|
|
21
|
-
})(AskSaveResult || (AskSaveResult = {}));
|
|
15
|
+
const { Path } = ide_core_common_1.path;
|
|
22
16
|
let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_core_browser_1.WithEventBus {
|
|
23
17
|
constructor() {
|
|
24
18
|
super();
|
|
@@ -28,7 +22,7 @@ let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_co
|
|
|
28
22
|
}
|
|
29
23
|
async init() {
|
|
30
24
|
const os = await this.applicationService.getBackendOS();
|
|
31
|
-
this.involvedFiles = new file_tree_set_1.FileTreeSet(os === ide_core_browser_1.
|
|
25
|
+
this.involvedFiles = new file_tree_set_1.FileTreeSet(os === ide_core_browser_1.OperatingSystem.Windows);
|
|
32
26
|
}
|
|
33
27
|
handlesUri(uri) {
|
|
34
28
|
const scheme = uri.scheme;
|
|
@@ -100,7 +94,7 @@ let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_co
|
|
|
100
94
|
}
|
|
101
95
|
}
|
|
102
96
|
if (shouldDiff.length > 0) {
|
|
103
|
-
return '...' +
|
|
97
|
+
return '...' + Path.separator + getMinimalDiffPath(resource.uri, shouldDiff);
|
|
104
98
|
}
|
|
105
99
|
else {
|
|
106
100
|
return null;
|
|
@@ -134,23 +128,23 @@ let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_co
|
|
|
134
128
|
}
|
|
135
129
|
// 询问用户是否保存
|
|
136
130
|
const buttons = {
|
|
137
|
-
[(0, ide_core_browser_1.localize)('file.prompt.dontSave', '不保存')]: AskSaveResult.REVERT,
|
|
138
|
-
[(0, ide_core_browser_1.localize)('file.prompt.save', '保存')]: AskSaveResult.SAVE,
|
|
139
|
-
[(0, ide_core_browser_1.localize)('file.prompt.cancel', '取消')]: AskSaveResult.CANCEL,
|
|
131
|
+
[(0, ide_core_browser_1.localize)('file.prompt.dontSave', '不保存')]: common_2.AskSaveResult.REVERT,
|
|
132
|
+
[(0, ide_core_browser_1.localize)('file.prompt.save', '保存')]: common_2.AskSaveResult.SAVE,
|
|
133
|
+
[(0, ide_core_browser_1.localize)('file.prompt.cancel', '取消')]: common_2.AskSaveResult.CANCEL,
|
|
140
134
|
};
|
|
141
135
|
const selection = await this.dialogService.open((0, ide_core_browser_1.formatLocalize)('saveChangesMessage', resource.name), ide_core_browser_1.MessageType.Info, Object.keys(buttons));
|
|
142
136
|
const result = buttons[selection];
|
|
143
|
-
if (result === AskSaveResult.SAVE) {
|
|
137
|
+
if (result === common_2.AskSaveResult.SAVE) {
|
|
144
138
|
const res = await documentModelRef.instance.save();
|
|
145
139
|
documentModelRef.dispose();
|
|
146
140
|
return res;
|
|
147
141
|
}
|
|
148
|
-
else if (result === AskSaveResult.REVERT) {
|
|
142
|
+
else if (result === common_2.AskSaveResult.REVERT) {
|
|
149
143
|
await documentModelRef.instance.revert();
|
|
150
144
|
documentModelRef.dispose();
|
|
151
145
|
return true;
|
|
152
146
|
}
|
|
153
|
-
else if (!result || result === AskSaveResult.CANCEL) {
|
|
147
|
+
else if (!result || result === common_2.AskSaveResult.CANCEL) {
|
|
154
148
|
documentModelRef.dispose();
|
|
155
149
|
return false;
|
|
156
150
|
}
|
|
@@ -190,8 +184,8 @@ exports.FileSystemResourceProvider = FileSystemResourceProvider;
|
|
|
190
184
|
* @param targets
|
|
191
185
|
*/
|
|
192
186
|
function getMinimalDiffPath(source, targets) {
|
|
193
|
-
const sourceDirPartsReverse = source.path.dir.toString().split(
|
|
194
|
-
const targetDirPartsReverses = targets.map((target) => target.path.dir.toString().split(
|
|
187
|
+
const sourceDirPartsReverse = source.path.dir.toString().split(Path.separator).reverse();
|
|
188
|
+
const targetDirPartsReverses = targets.map((target) => target.path.dir.toString().split(Path.separator).reverse());
|
|
195
189
|
for (let i = 0; i < sourceDirPartsReverse.length; i++) {
|
|
196
190
|
let foundSame = false;
|
|
197
191
|
for (const targetDirPartsReverse of targetDirPartsReverses) {
|
|
@@ -204,9 +198,9 @@ function getMinimalDiffPath(source, targets) {
|
|
|
204
198
|
return sourceDirPartsReverse
|
|
205
199
|
.slice(0, i + 1)
|
|
206
200
|
.reverse()
|
|
207
|
-
.join(
|
|
201
|
+
.join(Path.separator);
|
|
208
202
|
}
|
|
209
203
|
}
|
|
210
|
-
return sourceDirPartsReverse.reverse().join(
|
|
204
|
+
return sourceDirPartsReverse.reverse().join(Path.separator);
|
|
211
205
|
}
|
|
212
206
|
//# sourceMappingURL=fs-resource.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-resource.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAUoC;AACpC,sEAAuE;AACvE,+
|
|
1
|
+
{"version":3,"file":"fs-resource.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.splitDirectionMatches = exports.SplitDirection = exports.EditorGrid = exports.editorGridUid = void 0;
|
|
4
4
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
5
|
-
const
|
|
5
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
6
6
|
const common_1 = require("../../common");
|
|
7
7
|
const types_1 = require("../types");
|
|
8
8
|
exports.editorGridUid = new Set();
|
|
@@ -15,9 +15,9 @@ class EditorGrid {
|
|
|
15
15
|
this.onDidGridStateChange = this._onDidGridStateChange.event;
|
|
16
16
|
this._onDidGridAndDesendantStateChange = new ide_core_browser_1.Emitter();
|
|
17
17
|
this.onDidGridAndDesendantStateChange = this._onDidGridAndDesendantStateChange.event;
|
|
18
|
-
let uid = (0,
|
|
18
|
+
let uid = (0, ide_core_common_1.makeRandomHexString)(5);
|
|
19
19
|
while (exports.editorGridUid.has(uid)) {
|
|
20
|
-
uid = (0,
|
|
20
|
+
uid = (0, ide_core_common_1.makeRandomHexString)(5);
|
|
21
21
|
}
|
|
22
22
|
this.uid = uid;
|
|
23
23
|
exports.editorGridUid.add(uid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.service.js","sourceRoot":"","sources":["../../../src/browser/grid/grid.service.ts"],"names":[],"mappings":";;;AAAA,iEAAwF;AACxF
|
|
1
|
+
{"version":3,"file":"grid.service.js","sourceRoot":"","sources":["../../../src/browser/grid/grid.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,QAAQ,EAAa,QAAQ,EAAkB,MAAM,cAAc,CAAC;AACzF,OAAO,EACL,aAAa,EAEb,qBAAqB,EAItB,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAmD,eAAe,EAAoB,MAAM,WAAW,CAAC;AAQ/G,OAAO,EAA0C,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAE1G,OAAO,EAAE,mCAAmC,EAA+B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,QAAQ,EAAa,QAAQ,EAAkB,MAAM,cAAc,CAAC;AACzF,OAAO,EACL,aAAa,EAEb,qBAAqB,EAItB,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAmD,eAAe,EAAoB,MAAM,WAAW,CAAC;AAQ/G,OAAO,EAA0C,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAE1G,OAAO,EAAE,mCAAmC,EAA+B,MAAM,mBAAmB,CAAC;AAqBrG,OAAO,EACL,uBAAuB,EAGvB,qBAAqB,EAGrB,sBAAsB,EAEvB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,cAAc,qBAAqB,CAAC;AACpC,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AAEpC,qBACa,YAAa,SAAQ,aAAa;IAC7C,SAAS,EAAE,QAAQ,EAAE,CA+FnB;IACF,oBAAoB,SAA6B;IAEjD,SAAS,2BAAc;CACxB;AAED,qBACa,2BAA4B,YAAW,qBAAqB;IAEvE,eAAe,EAAG,eAAe,CAAC;IAGlC,uBAAuB,EAAG,uBAAuB,CAAC;IAGlD,sBAAsB,EAAG,0BAA0B,CAAC;IAGpD,oBAAoB,EAAE,mCAAmC,CAAC;IAG1D,oBAAoB,EAAE,qBAAqB,CAAC;IAG5C,qBAAqB,EAAE,sBAAsB,CAAC;IAG9C,QAAQ,EAAE,QAAQ,CAAC;IAGnB,YAAY,EAAE,8BAA8B,CAAC;IAG7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkD;IAE1E,UAAU;IAsBV,UAAU;CAGjB"}
|
package/lib/browser/index.js
CHANGED
|
@@ -26,7 +26,6 @@ const fs_resource_1 = require("./fs-resource");
|
|
|
26
26
|
const language_status_contribution_1 = require("./language/language-status.contribution");
|
|
27
27
|
const language_status_service_1 = require("./language/language-status.service");
|
|
28
28
|
const language_service_1 = require("./language/language.service");
|
|
29
|
-
const editor_context_1 = require("./menu/editor.context");
|
|
30
29
|
const editor_menu_1 = require("./menu/editor.menu");
|
|
31
30
|
const monaco_contrib_1 = require("./monaco-contrib");
|
|
32
31
|
const command_service_1 = require("./monaco-contrib/command/command.service");
|
|
@@ -135,7 +134,6 @@ let EditorModule = class EditorModule extends ide_core_browser_1.BrowserModule {
|
|
|
135
134
|
EditorClientAppContribution,
|
|
136
135
|
editor_contribution_1.EditorContribution,
|
|
137
136
|
compare_1.CompareEditorContribution,
|
|
138
|
-
editor_context_1.EditorContextMenuBrowserEditorContribution,
|
|
139
137
|
editor_contribution_1.EditorAutoSaveEditorContribution,
|
|
140
138
|
saveParticipants_1.SaveParticipantsContribution,
|
|
141
139
|
fs_resource_1.FileSystemResourceContribution,
|
package/lib/browser/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAyF;AACzF,iEAOoC;AACpC,0FAA+F;AAC/F,8EAI0D;AAC1D,kFAAwF;AAExF,sCAA+G;AAC/G,mDAAkE;AAElE,6CAAqD;AACrD,2CAA0D;AAC1D,iCAAuD;AACvD,4CAA2E;AAC3E,2CAAgD;AAChD,2CAA0G;AAC1G,mEAA4E;AAC5E,6CAAqG;AACrG,2EAA0E;AAC1E,+DAA6F;AAC7F,2EAAgF;AAChF,+CAA2C;AAC3C,uCAAsD;AACtD,+CAA+D;AAC/D,0FAAqF;AACrF,gFAA2E;AAC3E,kEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-status.service.d.ts","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AAGrF,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"language-status.service.d.ts","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AAGrF,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIvE,qBACa,qBAAsB,YAAW,sBAAsB;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkD;IAE5E,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAA8B;IAE9D,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW;IAI/C,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,eAAe,EAAE;CAYxD"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
7
7
|
const languageFeatureRegistry_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/modes/languageFeatureRegistry");
|
|
8
|
+
const { compare } = ide_core_common_1.strings;
|
|
8
9
|
let LanguageStatusService = class LanguageStatusService {
|
|
9
10
|
constructor() {
|
|
10
11
|
this._provider = new languageFeatureRegistry_1.LanguageFeatureRegistry();
|
|
@@ -17,10 +18,10 @@ let LanguageStatusService = class LanguageStatusService {
|
|
|
17
18
|
return this._provider.ordered(model).sort((a, b) => {
|
|
18
19
|
let res = b.severity - a.severity;
|
|
19
20
|
if (res === 0) {
|
|
20
|
-
res =
|
|
21
|
+
res = compare(a.source, b.source);
|
|
21
22
|
}
|
|
22
23
|
if (res === 0) {
|
|
23
|
-
res =
|
|
24
|
+
res = compare(a.id, b.id);
|
|
24
25
|
}
|
|
25
26
|
return res;
|
|
26
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-status.service.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAwE;AAExE,6HAA0H;
|
|
1
|
+
{"version":3,"file":"language-status.service.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAwE;AAExE,6HAA0H;AAI1H,MAAM,EAAE,OAAO,EAAE,GAAG,yBAAO,CAAC;AAG5B,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACmB,cAAS,GAAG,IAAI,iDAAuB,EAAmB,CAAC;QAEnE,gBAAW,GAAe,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;IAkBhE,CAAC;IAhBC,SAAS,CAAC,MAAuB;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,iBAAiB,CAAC,KAAiB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,GAAG,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;YAClC,IAAI,GAAG,KAAK,CAAC,EAAE;gBACb,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aACnC;YACD,IAAI,GAAG,KAAK,CAAC,EAAE;gBACb,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;aAC3B;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AArBY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAqBjC;AArBY,sDAAqB"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { Disposable, IContextKeyService } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { AbstractContextMenuService, ICtxMenuRenderer } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
3
|
+
import { ICodeEditor } from '@opensumi/ide-monaco/lib/common/types';
|
|
4
|
+
import { IAnchor } from '@opensumi/monaco-editor-core/esm/vs/base/browser/ui/contextview/contextview';
|
|
5
|
+
import { IEditorContribution } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
|
|
6
|
+
import { ContextMenuController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/contextmenu/contextmenu';
|
|
7
|
+
export declare class EditorContextMenuController extends Disposable implements IEditorContribution {
|
|
7
8
|
private readonly contextMenuService;
|
|
8
9
|
private readonly globalContextKeyService;
|
|
9
10
|
private readonly contextMenuRenderer;
|
|
11
|
+
private codeEditor;
|
|
12
|
+
static readonly ID = "editor.contrib.contextmenu";
|
|
13
|
+
static get(editor: ICodeEditor): ContextMenuController | null;
|
|
10
14
|
private readonly contextKeyService;
|
|
11
|
-
constructor(
|
|
12
|
-
|
|
15
|
+
constructor(contextMenuService: AbstractContextMenuService, globalContextKeyService: IContextKeyService, contextMenuRenderer: ICtxMenuRenderer, codeEditor: ICodeEditor);
|
|
16
|
+
showContextMenu(anchor?: IAnchor | null): void;
|
|
17
|
+
private onContextMenu;
|
|
13
18
|
private _doShowContextMenu;
|
|
14
19
|
private getMenuNodes;
|
|
15
20
|
}
|
|
16
|
-
export declare class EditorContextMenuBrowserEditorContribution implements BrowserEditorContribution {
|
|
17
|
-
injector: Injector;
|
|
18
|
-
registerEditorFeature(registry: IEditorFeatureRegistry): void;
|
|
19
|
-
}
|
|
20
21
|
//# sourceMappingURL=editor.context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.context.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"editor.context.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAU,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAChH,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAItG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4EAA4E,CAAC;AAGnH,qBAAa,2BAA4B,SAAQ,UAAW,YAAW,mBAAmB;IAUtF,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,UAAU;IAZpB,gBAAuB,EAAE,gCAAgC;WAE3C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,qBAAqB,GAAG,IAAI;IAIpE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;gBAGpC,kBAAkB,EAAE,0BAA0B,EAC9C,uBAAuB,EAAE,kBAAkB,EAC3C,mBAAmB,EAAE,gBAAgB,EAC9C,UAAU,EAAE,WAAW;IAkBjC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI;IAsB9C,OAAO,CAAC,aAAa;IA4DrB,OAAO,CAAC,kBAAkB;IAmD1B,OAAO,CAAC,YAAY;CASrB"}
|
|
@@ -1,63 +1,111 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.EditorContextMenuController = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const di_1 = require("@opensumi/di");
|
|
6
5
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
6
|
const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
|
|
8
7
|
const dom = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/base/browser/dom"));
|
|
8
|
+
const keyCodes_1 = require("@opensumi/monaco-editor-core/esm/vs/base/common/keyCodes");
|
|
9
|
+
const editorBrowser_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser");
|
|
9
10
|
const editorOptions_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions");
|
|
10
11
|
const contextmenu_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/contextmenu/contextmenu");
|
|
11
12
|
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
constructor(_editor) {
|
|
13
|
+
class EditorContextMenuController extends ide_core_browser_1.Disposable {
|
|
14
|
+
constructor(contextMenuService, globalContextKeyService, contextMenuRenderer, codeEditor) {
|
|
15
15
|
super();
|
|
16
|
-
this.
|
|
17
|
-
this.
|
|
18
|
-
this.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
if (!this['_editor'].getOption(editorOptions_1.EditorOption.contextmenu)) {
|
|
28
|
-
return; // Context menu is turned off through configuration
|
|
16
|
+
this.contextMenuService = contextMenuService;
|
|
17
|
+
this.globalContextKeyService = globalContextKeyService;
|
|
18
|
+
this.contextMenuRenderer = contextMenuRenderer;
|
|
19
|
+
this.codeEditor = codeEditor;
|
|
20
|
+
this.contextKeyService = this.registerDispose(this.globalContextKeyService.createScoped(this.codeEditor._contextKeyService));
|
|
21
|
+
this.addDispose(this.codeEditor.onContextMenu((e) => this.onContextMenu(e)));
|
|
22
|
+
this.addDispose(this.codeEditor.onKeyDown((e) => {
|
|
23
|
+
if (e.keyCode === keyCodes_1.KeyCode.ContextMenu) {
|
|
24
|
+
e.preventDefault();
|
|
25
|
+
e.stopPropagation();
|
|
26
|
+
this.showContextMenu();
|
|
29
27
|
}
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
}));
|
|
29
|
+
}
|
|
30
|
+
static get(editor) {
|
|
31
|
+
return editor.getContribution(contextmenu_1.ContextMenuController.ID);
|
|
32
|
+
}
|
|
33
|
+
showContextMenu(anchor) {
|
|
34
|
+
if (!this.codeEditor.getOption(editorOptions_1.EditorOption.contextmenu)) {
|
|
35
|
+
return; // Context menu is turned off through configuration
|
|
36
|
+
}
|
|
37
|
+
if (!this.codeEditor.hasModel()) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
if (!this.contextMenuService) {
|
|
41
|
+
this.codeEditor.focus();
|
|
42
|
+
return; // We need the context menu service to function
|
|
43
|
+
}
|
|
44
|
+
// Find actions available for menu
|
|
45
|
+
const menuNodes = this.getMenuNodes();
|
|
46
|
+
// Show menu if we have actions to show
|
|
47
|
+
if (menuNodes.length > 0) {
|
|
48
|
+
this._doShowContextMenu(menuNodes, anchor);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// ref: https://github.com/microsoft/vscode/blob/1498d0f34053f854e75e1364adaca6f99e43de08/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
|
|
52
|
+
onContextMenu(e) {
|
|
53
|
+
if (!this.codeEditor.hasModel()) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
if (!this.codeEditor.getOption(editorOptions_1.EditorOption.contextmenu)) {
|
|
57
|
+
this.codeEditor.focus();
|
|
58
|
+
// Ensure the cursor is at the position of the mouse click
|
|
59
|
+
if (e.target.position && !this.codeEditor.getSelection().containsPosition(e.target.position)) {
|
|
60
|
+
this.codeEditor.setPosition(e.target.position);
|
|
32
61
|
}
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
62
|
+
return; // Context menu is turned off through configuration
|
|
63
|
+
}
|
|
64
|
+
if (e.target.type === editorBrowser_1.MouseTargetType.OVERLAY_WIDGET) {
|
|
65
|
+
return; // allow native menu on widgets to support right click on input field for example in find
|
|
66
|
+
}
|
|
67
|
+
if (e.target.type === editorBrowser_1.MouseTargetType.CONTENT_TEXT && e.target.detail.injectedText) {
|
|
68
|
+
return; // allow native menu on injected text
|
|
69
|
+
}
|
|
70
|
+
e.event.preventDefault();
|
|
71
|
+
e.event.stopPropagation();
|
|
72
|
+
if (e.target.type !== editorBrowser_1.MouseTargetType.CONTENT_TEXT &&
|
|
73
|
+
e.target.type !== editorBrowser_1.MouseTargetType.CONTENT_EMPTY &&
|
|
74
|
+
e.target.type !== editorBrowser_1.MouseTargetType.TEXTAREA) {
|
|
75
|
+
return; // only support mouse click into text or native context menu key for now
|
|
76
|
+
}
|
|
77
|
+
// Ensure the editor gets focus if it hasn't, so the right events are being sent to other contributions
|
|
78
|
+
this.codeEditor.focus();
|
|
79
|
+
// Ensure the cursor is at the position of the mouse click
|
|
80
|
+
if (e.target.position) {
|
|
81
|
+
let hasSelectionAtPosition = false;
|
|
82
|
+
for (const selection of this.codeEditor.getSelections()) {
|
|
83
|
+
if (selection.containsPosition(e.target.position)) {
|
|
84
|
+
hasSelectionAtPosition = true;
|
|
85
|
+
break;
|
|
86
|
+
}
|
|
36
87
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
// Show menu if we have actions to show
|
|
40
|
-
if (menuNodes.length > 0) {
|
|
41
|
-
_this._doShowContextMenu(menuNodes, anchor);
|
|
88
|
+
if (!hasSelectionAtPosition) {
|
|
89
|
+
this.codeEditor.setPosition(e.target.position);
|
|
42
90
|
}
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
91
|
+
}
|
|
92
|
+
// Unless the user triggerd the context menu through Shift+F10, use the mouse position as menu position
|
|
93
|
+
let anchor = null;
|
|
94
|
+
if (e.target.type !== editorBrowser_1.MouseTargetType.TEXTAREA) {
|
|
95
|
+
anchor = { x: e.event.posx - 1, width: 2, y: e.event.posy - 1, height: 2 };
|
|
96
|
+
}
|
|
97
|
+
// Show the context menu
|
|
98
|
+
this.showContextMenu(anchor);
|
|
51
99
|
}
|
|
52
100
|
_doShowContextMenu(menuNodes, anchor) {
|
|
53
|
-
const editor = this.
|
|
101
|
+
const editor = this.codeEditor;
|
|
54
102
|
// https://github.com/microsoft/vscode/blob/master/src/vs/editor/contrib/contextmenu/contextmenu.ts#L196
|
|
55
103
|
if (!editor.hasModel()) {
|
|
56
104
|
return;
|
|
57
105
|
}
|
|
58
106
|
// Disable hover
|
|
59
|
-
const oldHoverSetting =
|
|
60
|
-
|
|
107
|
+
const oldHoverSetting = editor.getOption(monaco.editor.EditorOption.hover);
|
|
108
|
+
editor.updateOptions({
|
|
61
109
|
hover: {
|
|
62
110
|
enabled: false,
|
|
63
111
|
},
|
|
@@ -80,15 +128,15 @@ let EditorContextMenuController = class EditorContextMenuController extends ide_
|
|
|
80
128
|
y: anchor.y - window.scrollY,
|
|
81
129
|
},
|
|
82
130
|
menuNodes,
|
|
83
|
-
args: [
|
|
84
|
-
onHide: (
|
|
131
|
+
args: [editor.getModel().uri],
|
|
132
|
+
onHide: () => {
|
|
85
133
|
// 无论是否取消都应该恢复 hover 的设置
|
|
86
|
-
this.
|
|
134
|
+
this.codeEditor.updateOptions({
|
|
87
135
|
hover: oldHoverSetting,
|
|
88
136
|
});
|
|
89
137
|
// 右键菜单关闭后应该使编辑器重新 focus
|
|
90
138
|
// 原因是一些内置的 command (copy/cut/paste) 在执行时会在对应的 focusedEditor 执行，如果找不到 focusedEditor 则不会执行命令
|
|
91
|
-
this.
|
|
139
|
+
this.codeEditor.focus();
|
|
92
140
|
},
|
|
93
141
|
});
|
|
94
142
|
}
|
|
@@ -101,37 +149,7 @@ let EditorContextMenuController = class EditorContextMenuController extends ide_
|
|
|
101
149
|
contextMenu.dispose();
|
|
102
150
|
return menuNodes;
|
|
103
151
|
}
|
|
104
|
-
}
|
|
105
|
-
tslib_1.__decorate([
|
|
106
|
-
(0, di_1.Autowired)(next_1.AbstractContextMenuService),
|
|
107
|
-
tslib_1.__metadata("design:type", next_1.AbstractContextMenuService)
|
|
108
|
-
], EditorContextMenuController.prototype, "contextMenuService", void 0);
|
|
109
|
-
tslib_1.__decorate([
|
|
110
|
-
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
111
|
-
tslib_1.__metadata("design:type", Object)
|
|
112
|
-
], EditorContextMenuController.prototype, "globalContextKeyService", void 0);
|
|
113
|
-
tslib_1.__decorate([
|
|
114
|
-
(0, di_1.Autowired)(next_1.ICtxMenuRenderer),
|
|
115
|
-
tslib_1.__metadata("design:type", next_1.ICtxMenuRenderer)
|
|
116
|
-
], EditorContextMenuController.prototype, "contextMenuRenderer", void 0);
|
|
117
|
-
EditorContextMenuController = tslib_1.__decorate([
|
|
118
|
-
(0, di_1.Injectable)({ multiple: true }),
|
|
119
|
-
tslib_1.__metadata("design:paramtypes", [Object])
|
|
120
|
-
], EditorContextMenuController);
|
|
152
|
+
}
|
|
121
153
|
exports.EditorContextMenuController = EditorContextMenuController;
|
|
122
|
-
|
|
123
|
-
registerEditorFeature(registry) {
|
|
124
|
-
registry.registerEditorFeatureContribution({
|
|
125
|
-
contribute: (editor) => this.injector.get(EditorContextMenuController, [editor]),
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
};
|
|
129
|
-
tslib_1.__decorate([
|
|
130
|
-
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
131
|
-
tslib_1.__metadata("design:type", di_1.Injector)
|
|
132
|
-
], EditorContextMenuBrowserEditorContribution.prototype, "injector", void 0);
|
|
133
|
-
EditorContextMenuBrowserEditorContribution = tslib_1.__decorate([
|
|
134
|
-
(0, ide_core_browser_1.Domain)(types_1.BrowserEditorContribution)
|
|
135
|
-
], EditorContextMenuBrowserEditorContribution);
|
|
136
|
-
exports.EditorContextMenuBrowserEditorContribution = EditorContextMenuBrowserEditorContribution;
|
|
154
|
+
EditorContextMenuController.ID = 'editor.contrib.contextmenu';
|
|
137
155
|
//# sourceMappingURL=editor.context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,SAAS,
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,SAAS,EAKT,GAAG,EACJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAEzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAIpE,OAAO,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC;AAOvF,cAAM,qBAAqB;IACb,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAe,OAAO,CAAC,QAAQ;gBAA1C,WAAW,EAAE,WAAW,EAAU,QAAQ,SAAI;IAE3E,OAAO;IAKP,OAAO;CAMR;AAED,qBAAa,kBAAkB;IAyB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;IACxC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE;IACnC,QAAQ,CAAC,GAAG,EAAE,qBAAqB;WA3BxB,MAAM,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAEjC,OAAO;IASP,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAS3C,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYhG,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAWvG;AAED,qBACa,oBAAqB,YAAW,qBAAqB;IAEhE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IAE7D,OAAO,CAAC,MAAM,CAA0E;IAExF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,qBAAqB;IAItE,4BAA4B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IA+BpE,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;IAS7E,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;CAQ9E"}
|
|
@@ -6,6 +6,7 @@ const di_1 = require("@opensumi/di");
|
|
|
6
6
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
7
7
|
const callHierarchy_1 = require("@opensumi/ide-monaco/lib/browser/contrib/callHierarchy");
|
|
8
8
|
const types_1 = require("../../doc-model/types");
|
|
9
|
+
const { isNonEmptyArray } = ide_core_common_1.arrays;
|
|
9
10
|
/* ---------------------------------------------------------------------------------------------
|
|
10
11
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
11
12
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
@@ -60,7 +61,7 @@ class CallHierarchyModel {
|
|
|
60
61
|
async resolveIncomingCalls(item, token) {
|
|
61
62
|
try {
|
|
62
63
|
const result = await this.provider.provideIncomingCalls(item, token);
|
|
63
|
-
if (
|
|
64
|
+
if (isNonEmptyArray(result)) {
|
|
64
65
|
return result;
|
|
65
66
|
}
|
|
66
67
|
}
|
|
@@ -72,7 +73,7 @@ class CallHierarchyModel {
|
|
|
72
73
|
async resolveOutgoingCalls(item, token) {
|
|
73
74
|
try {
|
|
74
75
|
const result = await this.provider.provideOutgoingCalls(item, token);
|
|
75
|
-
if (
|
|
76
|
+
if (isNonEmptyArray(result)) {
|
|
76
77
|
return result;
|
|
77
78
|
}
|
|
78
79
|
}
|
|
@@ -115,6 +116,9 @@ let CallHierarchyService = class CallHierarchyService {
|
|
|
115
116
|
return [model.root];
|
|
116
117
|
}
|
|
117
118
|
finally {
|
|
119
|
+
if ((0, ide_core_common_1.isFunction)(textModel === null || textModel === void 0 ? void 0 : textModel.dispose)) {
|
|
120
|
+
textModel.dispose();
|
|
121
|
+
}
|
|
118
122
|
textModelReference === null || textModelReference === void 0 ? void 0 : textModelReference.dispose();
|
|
119
123
|
}
|
|
120
124
|
}
|