@opensumi/ide-editor 2.17.8 → 2.18.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 +3 -3
- package/lib/browser/breadcrumb/default.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.d.ts.map +1 -1
- package/lib/browser/component.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 +10 -11
- package/lib/browser/doc-model/editor-document-model-service.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.map +1 -1
- package/lib/browser/editor.contribution.js +40 -11
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.module.less +10 -2
- package/lib/browser/editor.view.d.ts +1 -6
- package/lib/browser/editor.view.d.ts.map +1 -1
- package/lib/browser/editor.view.js +2 -14
- 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/format/format.service.d.ts +9 -0
- package/lib/browser/format/format.service.d.ts.map +1 -0
- package/lib/browser/format/format.service.js +81 -0
- package/lib/browser/format/format.service.js.map +1 -0
- package/lib/browser/format/formatterSelect.d.ts +2 -3
- package/lib/browser/format/formatterSelect.d.ts.map +1 -1
- package/lib/browser/format/formatterSelect.js +18 -9
- package/lib/browser/format/formatterSelect.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 +7 -7
- 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 +8 -0
- 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/open-type-menu.contribution.d.ts +11 -0
- package/lib/browser/menu/open-type-menu.contribution.d.ts.map +1 -0
- package/lib/browser/menu/open-type-menu.contribution.js +83 -0
- package/lib/browser/menu/open-type-menu.contribution.js.map +1 -0
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +2 -9
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js +4 -22
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js.map +1 -1
- package/lib/browser/monaco-contrib/index.d.ts +2 -0
- package/lib/browser/monaco-contrib/index.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/index.js +2 -0
- package/lib/browser/monaco-contrib/index.js.map +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.d.ts +20 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.d.ts.map +1 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.js +58 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.js.map +1 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts +26 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts.map +1 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.js +125 -0
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.js.map +1 -0
- 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 +8 -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/untitled-resource.d.ts.map +1 -1
- package/lib/browser/untitled-resource.js +4 -5
- package/lib/browser/untitled-resource.js.map +1 -1
- package/lib/browser/view/topPadding.js +1 -1
- package/lib/browser/workbench-editor.service.d.ts +1 -1
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +28 -10
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/lib/common/editor.d.ts +13 -1
- package/lib/common/editor.d.ts.map +1 -1
- package/lib/common/editor.js +8 -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/package.json +12 -12
|
@@ -4,7 +4,6 @@ exports.BaseFileSystemEditorDocumentProvider = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
-
const encoding_1 = require("@opensumi/ide-core-common/lib/encoding");
|
|
8
7
|
const ide_file_service_1 = require("@opensumi/ide-file-service");
|
|
9
8
|
const schema_1 = require("../preference/schema");
|
|
10
9
|
/**
|
|
@@ -31,7 +30,7 @@ let BaseFileSystemEditorDocumentProvider = class BaseFileSystemEditorDocumentPro
|
|
|
31
30
|
return this.fileServiceClient.handlesScheme(scheme);
|
|
32
31
|
}
|
|
33
32
|
provideEncoding(uri) {
|
|
34
|
-
return this._detectedEncodingMap.get(uri.toString()) ||
|
|
33
|
+
return this._detectedEncodingMap.get(uri.toString()) || ide_core_browser_1.UTF8;
|
|
35
34
|
}
|
|
36
35
|
async provideEOL(uri) {
|
|
37
36
|
const backendOS = await this.applicationService.getBackendOS();
|
|
@@ -39,13 +38,13 @@ let BaseFileSystemEditorDocumentProvider = class BaseFileSystemEditorDocumentPro
|
|
|
39
38
|
if (eol !== 'auto') {
|
|
40
39
|
return eol;
|
|
41
40
|
}
|
|
42
|
-
return backendOS === ide_core_browser_1.
|
|
41
|
+
return backendOS === ide_core_browser_1.OperatingSystem.Windows ? "\r\n" /* CRLF */ : "\n" /* LF */;
|
|
43
42
|
}
|
|
44
43
|
async read(uri, options) {
|
|
45
44
|
const { content: buffer } = await this.fileServiceClient.readFile(uri.toString());
|
|
46
45
|
const guessEncoding = options.autoGuessEncoding ||
|
|
47
46
|
this.preferenceService.get('files.autoGuessEncoding', undefined, uri.toString(), (0, ide_core_browser_1.getLanguageIdFromMonaco)(uri));
|
|
48
|
-
const detected = await (0,
|
|
47
|
+
const detected = await (0, ide_core_browser_1.detectEncodingFromBuffer)(buffer, guessEncoding);
|
|
49
48
|
detected.encoding = await this.getReadEncoding(uri, options, detected.encoding);
|
|
50
49
|
const content = buffer.toString(detected.encoding);
|
|
51
50
|
const uriString = uri.toString();
|
|
@@ -53,7 +52,7 @@ let BaseFileSystemEditorDocumentProvider = class BaseFileSystemEditorDocumentPro
|
|
|
53
52
|
// 记录表示这个文档被[这个editorDocumentProvider]引用了
|
|
54
53
|
this._fileContentMd5OnBrowserFs.add(uriString);
|
|
55
54
|
return {
|
|
56
|
-
encoding: detected.encoding ||
|
|
55
|
+
encoding: detected.encoding || ide_core_browser_1.UTF8,
|
|
57
56
|
content,
|
|
58
57
|
};
|
|
59
58
|
}
|
|
@@ -107,8 +106,8 @@ let BaseFileSystemEditorDocumentProvider = class BaseFileSystemEditorDocumentPro
|
|
|
107
106
|
let preferredEncoding;
|
|
108
107
|
// Encoding passed in as option
|
|
109
108
|
if (options === null || options === void 0 ? void 0 : options.encoding) {
|
|
110
|
-
if (detectedEncoding ===
|
|
111
|
-
preferredEncoding =
|
|
109
|
+
if (detectedEncoding === ide_core_browser_1.UTF8_with_bom && options.encoding === ide_core_browser_1.UTF8) {
|
|
110
|
+
preferredEncoding = ide_core_browser_1.UTF8_with_bom; // indicate the file has BOM if we are to resolve with UTF 8
|
|
112
111
|
}
|
|
113
112
|
else {
|
|
114
113
|
preferredEncoding = options.encoding; // give passed in encoding highest priority
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-editor-doc.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"fs-editor-doc.js","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-editor-doc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-resource.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,GAAG,EAEH,YAAY,EAIZ,MAAM,EACN,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"fs-resource.d.ts","sourceRoot":"","sources":["../../../src/browser/fs-resource/fs-resource.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,GAAG,EAEH,YAAY,EAIZ,MAAM,EACN,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAA2B,aAAa,EAAE,MAAM,cAAc,CAAC;AAEpG,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAMjE,qBACa,0BAA2B,SAAQ,YAAa,YAAW,iBAAiB;IAEvF,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAGrC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAGhD,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;IAGxC,SAAS,CAAC,oBAAoB,EAAE,2BAA2B,CAAC;IAG5D,SAAS,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAElD,cAAc,uCAAsD;IAEpE,OAAO,CAAC,aAAa,CAAc;IAEnC,OAAO,CAAC,KAAK,CAAgB;;IAQvB,IAAI;IAKV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAS5B,SAAS,CAAC,MAAM;IA4BV,WAAW,CAAC,GAAG,EAAE,MAAM;IAOvB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAkBxD,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,MAAM,GAAG,IAAI;IAmBvF,iBAAiB,CAAC,QAAQ,KAAA;IAIpB,iCAAiC,CAAC,QAAQ,EAAE,SAAS;IAOrD,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,aAAa;IAoBrD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAqCjG"}
|
|
@@ -6,13 +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");
|
|
15
|
+
const { Path } = ide_core_common_1.path;
|
|
16
16
|
let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_core_browser_1.WithEventBus {
|
|
17
17
|
constructor() {
|
|
18
18
|
super();
|
|
@@ -22,7 +22,7 @@ let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_co
|
|
|
22
22
|
}
|
|
23
23
|
async init() {
|
|
24
24
|
const os = await this.applicationService.getBackendOS();
|
|
25
|
-
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);
|
|
26
26
|
}
|
|
27
27
|
handlesUri(uri) {
|
|
28
28
|
const scheme = uri.scheme;
|
|
@@ -97,7 +97,7 @@ let FileSystemResourceProvider = class FileSystemResourceProvider extends ide_co
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
if (shouldDiff.length > 0) {
|
|
100
|
-
return '...' +
|
|
100
|
+
return '...' + Path.separator + getMinimalDiffPath(resource.uri, shouldDiff);
|
|
101
101
|
}
|
|
102
102
|
else {
|
|
103
103
|
return null;
|
|
@@ -202,8 +202,8 @@ exports.FileSystemResourceProvider = FileSystemResourceProvider;
|
|
|
202
202
|
* @param targets
|
|
203
203
|
*/
|
|
204
204
|
function getMinimalDiffPath(source, targets) {
|
|
205
|
-
const sourceDirPartsReverse = source.path.dir.toString().split(
|
|
206
|
-
const targetDirPartsReverses = targets.map((target) => target.path.dir.toString().split(
|
|
205
|
+
const sourceDirPartsReverse = source.path.dir.toString().split(Path.separator).reverse();
|
|
206
|
+
const targetDirPartsReverses = targets.map((target) => target.path.dir.toString().split(Path.separator).reverse());
|
|
207
207
|
for (let i = 0; i < sourceDirPartsReverse.length; i++) {
|
|
208
208
|
let foundSame = false;
|
|
209
209
|
for (const targetDirPartsReverse of targetDirPartsReverses) {
|
|
@@ -216,9 +216,9 @@ function getMinimalDiffPath(source, targets) {
|
|
|
216
216
|
return sourceDirPartsReverse
|
|
217
217
|
.slice(0, i + 1)
|
|
218
218
|
.reverse()
|
|
219
|
-
.join(
|
|
219
|
+
.join(Path.separator);
|
|
220
220
|
}
|
|
221
221
|
}
|
|
222
|
-
return sourceDirPartsReverse.reverse().join(
|
|
222
|
+
return sourceDirPartsReverse.reverse().join(Path.separator);
|
|
223
223
|
}
|
|
224
224
|
//# 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":";;;;AAAA,qCAAqD;AACrD,iEAUoC;AACpC,sEAAuE;AACvE,+DAAiE;AACjE,kEAAqF;AACrF,uDAAuD;AAEvD,yCAAoG;AACpG,yCAA2C;AAC3C,8CAAiE;AAEjE,mDAA8C;AAE9C,MAAM,EAAE,IAAI,EAAE,GAAG,sBAAI,CAAC;AAGtB,IAAa,0BAA0B,GAAvC,MAAa,0BAA2B,SAAQ,+BAAY;IAsB1D;QACE,KAAK,EAAE,CAAC;QAPV,mBAAc,GAAG,IAAI,yBAAM,CAA+B,GAAG,EAAE,GAAG,CAAC,CAAC;QAQlE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,2BAAW,CAAC,EAAE,KAAK,kCAAe,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,UAAU,CAAC,GAAQ;QACjB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1B,IAAI,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;YAChD,OAAO,EAAE,CAAC;SACX;aAAM;YACL,OAAO,CAAC,CAAC,CAAC;SACX;IACH,CAAC;IAES,MAAM;QACd,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1C,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;gBACnB,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAc,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAc,CAAC,OAAO,EAAE;oBAClF,oBAAoB;oBACpB,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,IAAI,sBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBACtF,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBAC1B,MAAM,QAAQ,GAAG,sBAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC7B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAChD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC5D,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,gCAAgC;oBAChC,6BAA6B;oBAC7B,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;wBAC5F,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAuB,CAAC,IAAI,sBAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;qBACtE;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,EAAE;;YACpC,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAI,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,EAAE;gBACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gCAAuB,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAW;QAC3B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SACxF;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAQ;QAC5B,+CAA+C;QAC/C,MAAM,IAAI,CAAC,KAAK,CAAC;QACjB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC,GAAG,CAAC;YACjB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;YAC9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;SACtB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACxC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,IAAA,2BAAQ,EAAC,uBAAuB,EAAE,OAAO,CAAC;YACrE,IAAI;YACJ,GAAG;YACH,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,CAAC,IAAI;YACd,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,sBAAsB,CAAC,QAAmB,EAAE,cAA2B;QACrE,MAAM,UAAU,GAAU,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE;YAChC,IACE,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC;gBACpD,GAAG,CAAC,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,GAAG,CAAC,WAAW;gBAChD,GAAG,KAAK,QAAQ,EAChB;gBACA,mBAAmB;gBACnB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC1B;SACF;QACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,OAAO,KAAK,GAAG,IAAI,CAAC,SAAS,GAAG,kBAAkB,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;SAC9E;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,iBAAiB,CAAC,QAAQ;;QACxB,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,KAAK,CAAC,iCAAiC,CAAC,QAAmB;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;QAC3G,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE;YACvD,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,QAAmB,EAAE,UAA0B;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;QAC3G,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,KAAK,CAAC;SACd;QACD,IAAI,UAAU,KAAK,sBAAa,CAAC,IAAI,EAAE;YACrC,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnD,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,GAAG,CAAC;SACZ;aAAM,IAAI,UAAU,KAAK,sBAAa,CAAC,MAAM,EAAE;YAC9C,MAAM,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACzC,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,sBAAa,CAAC,MAAM,EAAE;YAC7D,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IACD,KAAK,CAAC,mBAAmB,CAAC,QAAmB,EAAE,eAA8B;QAC3E,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE;YACvC,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;gBACzB,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,oBAAW,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;oBAC5G,KAAK,EAAE,CAAC;iBACT;gBACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE;oBACtG,KAAK,EAAE,CAAC;iBACT;gBACD,IAAI,KAAK,GAAG,CAAC,EAAE;oBACb,OAAO,IAAI,CAAC;iBACb;aACF;SACF;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;QAC3G,IAAI,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE;YACzD,IAAI,gBAAgB,EAAE;gBACpB,gBAAgB,CAAC,OAAO,EAAE,CAAC;aAC5B;YACD,OAAO,IAAI,CAAC;SACb;QAED,WAAW;QACX,MAAM,OAAO,GAAG;YACd,CAAC,IAAA,2BAAQ,EAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC,EAAE,sBAAa,CAAC,MAAM;YAC/D,CAAC,IAAA,2BAAQ,EAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,EAAE,sBAAa,CAAC,IAAI;YACxD,CAAC,IAAA,2BAAQ,EAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC,EAAE,sBAAa,CAAC,MAAM;SAC7D,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAC7C,IAAA,iCAAc,EAAC,oBAAoB,EAAE,QAAQ,CAAC,IAAI,CAAC,EACnD,8BAAW,CAAC,IAAI,EAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CACrB,CAAC;QACF,MAAM,MAAM,GAAG,OAAO,CAAC,SAAU,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;CACF,CAAA;AApLC;IADC,IAAA,cAAS,GAAE;sCACY,uBAAY;gEAAC;AAGrC;IADC,IAAA,cAAS,EAAC,2BAAkB,CAAC;;qEACkB;AAGhD;IADC,IAAA,cAAS,EAAC,4BAAc,CAAC;;iEACc;AAGxC;IADC,IAAA,cAAS,EAAC,mCAA2B,CAAC;;wEACqB;AAG5D;IADC,IAAA,cAAS,EAAC,sCAAmB,CAAC;;sEACmB;AAdvC,0BAA0B;IADtC,IAAA,eAAU,GAAE;;GACA,0BAA0B,CAsLtC;AAtLY,gEAA0B;AAwLvC;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,MAAW,EAAE,OAAc;IACrD,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;IACzF,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACnH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrD,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,KAAK,MAAM,qBAAqB,IAAI,sBAAsB,EAAE;YAC1D,IAAI,qBAAqB,CAAC,CAAC,CAAC,KAAK,qBAAqB,CAAC,CAAC,CAAC,EAAE;gBACzD,SAAS,GAAG,IAAI,CAAC;gBACjB,MAAM;aACP;SACF;QACD,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,qBAAqB;iBACzB,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;iBACf,OAAO,EAAE;iBACT,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACzB;KACF;IACD,OAAO,qBAAqB,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -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;
|
|
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;AAUpC,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;AA2BrG,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,CAqGnB;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
|
@@ -7,6 +7,7 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
|
7
7
|
const callHierarchy_1 = require("@opensumi/ide-monaco/lib/browser/contrib/callHierarchy");
|
|
8
8
|
const command_1 = require("@opensumi/ide-monaco/lib/browser/contrib/command");
|
|
9
9
|
const tokenizer_1 = require("@opensumi/ide-monaco/lib/browser/contrib/tokenizer");
|
|
10
|
+
const typeHierarchy_1 = require("@opensumi/ide-monaco/lib/browser/contrib/typeHierarchy");
|
|
10
11
|
const common_1 = require("../common");
|
|
11
12
|
const doc_cache_1 = require("../common/doc-cache");
|
|
12
13
|
const breadcrumb_1 = require("./breadcrumb");
|
|
@@ -27,6 +28,7 @@ const language_status_contribution_1 = require("./language/language-status.contr
|
|
|
27
28
|
const language_status_service_1 = require("./language/language-status.service");
|
|
28
29
|
const language_service_1 = require("./language/language.service");
|
|
29
30
|
const editor_menu_1 = require("./menu/editor.menu");
|
|
31
|
+
const open_type_menu_contribution_1 = require("./menu/open-type-menu.contribution");
|
|
30
32
|
const monaco_contrib_1 = require("./monaco-contrib");
|
|
31
33
|
const command_service_1 = require("./monaco-contrib/command/command.service");
|
|
32
34
|
const textmate_service_1 = require("./monaco-contrib/tokenizer/textmate.service");
|
|
@@ -109,6 +111,10 @@ let EditorModule = class EditorModule extends ide_core_browser_1.BrowserModule {
|
|
|
109
111
|
token: callHierarchy_1.ICallHierarchyService,
|
|
110
112
|
useClass: monaco_contrib_1.CallHierarchyService,
|
|
111
113
|
},
|
|
114
|
+
{
|
|
115
|
+
token: typeHierarchy_1.ITypeHierarchyService,
|
|
116
|
+
useClass: monaco_contrib_1.TypeHierarchyService,
|
|
117
|
+
},
|
|
112
118
|
{
|
|
113
119
|
token: command_1.ICommandServiceToken,
|
|
114
120
|
useClass: command_service_1.MonacoCommandService,
|
|
@@ -138,7 +144,9 @@ let EditorModule = class EditorModule extends ide_core_browser_1.BrowserModule {
|
|
|
138
144
|
saveParticipants_1.SaveParticipantsContribution,
|
|
139
145
|
fs_resource_1.FileSystemResourceContribution,
|
|
140
146
|
monaco_contrib_1.CallHierarchyContribution,
|
|
147
|
+
monaco_contrib_1.TypeHierarchyContribution,
|
|
141
148
|
language_status_contribution_1.LanguageStatusContribution,
|
|
149
|
+
open_type_menu_contribution_1.OpenTypeMenuContribution,
|
|
142
150
|
];
|
|
143
151
|
this.contributionProvider = types_2.BrowserEditorContribution;
|
|
144
152
|
this.component = editor_view_1.EditorView;
|
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;
|
|
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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { IMenuRegistry, MenuContribution } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
2
|
+
import { CommandContribution, CommandRegistry, Disposable } from '@opensumi/ide-core-common';
|
|
3
|
+
export declare class OpenTypeMenuContribution extends Disposable implements CommandContribution, MenuContribution {
|
|
4
|
+
private readonly workbenchEditorService;
|
|
5
|
+
private readonly menuRegistry;
|
|
6
|
+
registerCommands(commands: CommandRegistry): void;
|
|
7
|
+
constructor();
|
|
8
|
+
registerMenus(menuRegistry: IMenuRegistry): void;
|
|
9
|
+
private registerMenuItem;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=open-type-menu.contribution.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-type-menu.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAGb,gBAAgB,EAGjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAY,MAAM,2BAA2B,CAAC;AAgBhH,qBACa,wBAAyB,SAAQ,UAAW,YAAW,mBAAmB,EAAE,gBAAgB;IAEvG,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IAGpE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;;IAgCjD,aAAa,CAAC,YAAY,EAAE,aAAa;IAEzC,OAAO,CAAC,gBAAgB;CAuBzB"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OpenTypeMenuContribution = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const di_1 = require("@opensumi/di");
|
|
6
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
+
const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
|
|
8
|
+
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
+
const di_helper_1 = require("@opensumi/ide-core-common/lib/di-helper");
|
|
10
|
+
const types_1 = require("../types");
|
|
11
|
+
const workbench_editor_service_1 = require("./../workbench-editor.service");
|
|
12
|
+
const SUB_MENU_ID = 'editor/openType/submenu';
|
|
13
|
+
var OPEN_TYPE_COMMANDS;
|
|
14
|
+
(function (OPEN_TYPE_COMMANDS) {
|
|
15
|
+
OPEN_TYPE_COMMANDS.EDITOR_OPEN_TYPE = {
|
|
16
|
+
id: 'editor.opentype',
|
|
17
|
+
};
|
|
18
|
+
})(OPEN_TYPE_COMMANDS || (OPEN_TYPE_COMMANDS = {}));
|
|
19
|
+
let OpenTypeMenuContribution = class OpenTypeMenuContribution extends ide_core_common_1.Disposable {
|
|
20
|
+
constructor() {
|
|
21
|
+
super();
|
|
22
|
+
this.disposables.push(this.workbenchEditorService.onActiveResourceChange((e) => {
|
|
23
|
+
const openTypes = this.workbenchEditorService.currentEditorGroup.availableOpenTypes;
|
|
24
|
+
// 如果打开方式没有两个以上，则不需要展示
|
|
25
|
+
const preMenu = this.menuRegistry
|
|
26
|
+
.getMenuItems(SUB_MENU_ID)
|
|
27
|
+
.map((e) => e.command);
|
|
28
|
+
preMenu.forEach((c) => {
|
|
29
|
+
this.menuRegistry.unregisterMenuItem(SUB_MENU_ID, c.id);
|
|
30
|
+
});
|
|
31
|
+
this.menuRegistry.unregisterMenuItem(next_1.MenuId.EditorTitle, SUB_MENU_ID);
|
|
32
|
+
if (openTypes.length >= 2) {
|
|
33
|
+
this.registerMenuItem(openTypes);
|
|
34
|
+
}
|
|
35
|
+
}));
|
|
36
|
+
}
|
|
37
|
+
registerCommands(commands) {
|
|
38
|
+
commands.registerCommand(OPEN_TYPE_COMMANDS.EDITOR_OPEN_TYPE, {
|
|
39
|
+
execute: (id) => {
|
|
40
|
+
if (id) {
|
|
41
|
+
this.workbenchEditorService.currentEditorGroup.changeOpenType(id);
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
registerMenus(menuRegistry) { }
|
|
47
|
+
registerMenuItem(openTypes) {
|
|
48
|
+
const openTypeMenus = {
|
|
49
|
+
submenu: SUB_MENU_ID,
|
|
50
|
+
label: (0, ide_core_common_1.localize)('editor.openType'),
|
|
51
|
+
group: 'navigation',
|
|
52
|
+
order: Number.MIN_SAFE_INTEGER,
|
|
53
|
+
iconClass: (0, ide_core_browser_1.getIcon)('setting'),
|
|
54
|
+
type: 'default',
|
|
55
|
+
};
|
|
56
|
+
this.menuRegistry.registerMenuItem(next_1.MenuId.EditorTitle, openTypeMenus);
|
|
57
|
+
openTypes.forEach((type) => {
|
|
58
|
+
var _a;
|
|
59
|
+
this.menuRegistry.registerMenuItem(SUB_MENU_ID, {
|
|
60
|
+
command: {
|
|
61
|
+
id: OPEN_TYPE_COMMANDS.EDITOR_OPEN_TYPE.id,
|
|
62
|
+
label: type.title || type.componentId || type.type,
|
|
63
|
+
},
|
|
64
|
+
extraTailArgs: [(_a = type.componentId) !== null && _a !== void 0 ? _a : type.type],
|
|
65
|
+
group: 'navigation',
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
tslib_1.__decorate([
|
|
71
|
+
(0, di_1.Autowired)(types_1.WorkbenchEditorService),
|
|
72
|
+
tslib_1.__metadata("design:type", workbench_editor_service_1.WorkbenchEditorServiceImpl)
|
|
73
|
+
], OpenTypeMenuContribution.prototype, "workbenchEditorService", void 0);
|
|
74
|
+
tslib_1.__decorate([
|
|
75
|
+
(0, di_1.Autowired)(next_1.IMenuRegistry),
|
|
76
|
+
tslib_1.__metadata("design:type", next_1.IMenuRegistry)
|
|
77
|
+
], OpenTypeMenuContribution.prototype, "menuRegistry", void 0);
|
|
78
|
+
OpenTypeMenuContribution = tslib_1.__decorate([
|
|
79
|
+
(0, di_helper_1.Domain)(ide_core_common_1.CommandContribution, next_1.MenuContribution),
|
|
80
|
+
tslib_1.__metadata("design:paramtypes", [])
|
|
81
|
+
], OpenTypeMenuContribution);
|
|
82
|
+
exports.OpenTypeMenuContribution = OpenTypeMenuContribution;
|
|
83
|
+
//# sourceMappingURL=open-type-menu.contribution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-type-menu.contribution.js","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,13 @@
|
|
|
1
|
-
import { CancellationToken,
|
|
1
|
+
import { CancellationToken, IPosition, RefCountedDisposable, Uri } from '@opensumi/ide-core-common';
|
|
2
2
|
import { CallHierarchyItem, CallHierarchyProvider, ICallHierarchyService, IncomingCall, OutgoingCall } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
|
|
3
3
|
import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
4
4
|
import { IEditorDocumentModelService } from '../../doc-model/types';
|
|
5
5
|
declare type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
|
|
6
|
-
declare class RefCountedDisposabled {
|
|
7
|
-
private readonly _disposable;
|
|
8
|
-
private _counter;
|
|
9
|
-
constructor(_disposable: IDisposable, _counter?: number);
|
|
10
|
-
acquire(): this;
|
|
11
|
-
release(): this;
|
|
12
|
-
}
|
|
13
6
|
export declare class CallHierarchyModel {
|
|
14
7
|
readonly id: string;
|
|
15
8
|
readonly provider: CallHierarchyProvider;
|
|
16
9
|
readonly roots: CallHierarchyItem[];
|
|
17
|
-
readonly ref:
|
|
10
|
+
readonly ref: RefCountedDisposable;
|
|
18
11
|
static create(model: ITextModel, position: IPosition, token: CancellationToken): Promise<CallHierarchyModel | undefined>;
|
|
19
12
|
readonly root: CallHierarchyItem;
|
|
20
13
|
private constructor();
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAET,oBAAoB,EAGpB,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,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,oBAAoB;WA3BvB,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;IA4BpE,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,27 +6,12 @@ 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.
|
|
12
13
|
*--------------------------------------------------------------------------------------------*/
|
|
13
14
|
// Some code copied and modified from https://github.com/microsoft/vscode/tree/main/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
|
|
14
|
-
class RefCountedDisposabled {
|
|
15
|
-
constructor(_disposable, _counter = 1) {
|
|
16
|
-
this._disposable = _disposable;
|
|
17
|
-
this._counter = _counter;
|
|
18
|
-
}
|
|
19
|
-
acquire() {
|
|
20
|
-
this._counter++;
|
|
21
|
-
return this;
|
|
22
|
-
}
|
|
23
|
-
release() {
|
|
24
|
-
if (--this._counter === 0) {
|
|
25
|
-
this._disposable.dispose();
|
|
26
|
-
}
|
|
27
|
-
return this;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
15
|
class CallHierarchyModel {
|
|
31
16
|
constructor(id, provider, roots, ref) {
|
|
32
17
|
this.id = id;
|
|
@@ -44,7 +29,7 @@ class CallHierarchyModel {
|
|
|
44
29
|
if (!session) {
|
|
45
30
|
return undefined;
|
|
46
31
|
}
|
|
47
|
-
return new CallHierarchyModel(session.roots.reduce((p, c) => p + c._sessionId, ''), provider, session.roots, new
|
|
32
|
+
return new CallHierarchyModel(session.roots.reduce((p, c) => p + c._sessionId, ''), provider, session.roots, new ide_core_common_1.RefCountedDisposable(session));
|
|
48
33
|
}
|
|
49
34
|
dispose() {
|
|
50
35
|
this.ref.release();
|
|
@@ -60,7 +45,7 @@ class CallHierarchyModel {
|
|
|
60
45
|
async resolveIncomingCalls(item, token) {
|
|
61
46
|
try {
|
|
62
47
|
const result = await this.provider.provideIncomingCalls(item, token);
|
|
63
|
-
if (
|
|
48
|
+
if (isNonEmptyArray(result)) {
|
|
64
49
|
return result;
|
|
65
50
|
}
|
|
66
51
|
}
|
|
@@ -72,7 +57,7 @@ class CallHierarchyModel {
|
|
|
72
57
|
async resolveOutgoingCalls(item, token) {
|
|
73
58
|
try {
|
|
74
59
|
const result = await this.provider.provideOutgoingCalls(item, token);
|
|
75
|
-
if (
|
|
60
|
+
if (isNonEmptyArray(result)) {
|
|
76
61
|
return result;
|
|
77
62
|
}
|
|
78
63
|
}
|
|
@@ -115,9 +100,6 @@ let CallHierarchyService = class CallHierarchyService {
|
|
|
115
100
|
return [model.root];
|
|
116
101
|
}
|
|
117
102
|
finally {
|
|
118
|
-
if ((0, ide_core_common_1.isFunction)(textModel === null || textModel === void 0 ? void 0 : textModel.dispose)) {
|
|
119
|
-
textModel.dispose();
|
|
120
|
-
}
|
|
121
103
|
textModelReference === null || textModelReference === void 0 ? void 0 : textModelReference.dispose();
|
|
122
104
|
}
|
|
123
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DASmC;AACnC,0FAOgE;AAGhE,iDAAoE;
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
export * from './callHierarchy/callHierarchy.contribution';
|
|
2
2
|
export * from './callHierarchy/callHierarchy.service';
|
|
3
|
+
export * from './typeHierarchy/typeHierarchy.contribution';
|
|
4
|
+
export * from './typeHierarchy/typeHierarchy.service';
|
|
3
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/monaco-contrib/index.ts"],"names":[],"mappings":"AAAA,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/monaco-contrib/index.ts"],"names":[],"mappings":"AAAA,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC"}
|
|
@@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./callHierarchy/callHierarchy.contribution"), exports);
|
|
5
5
|
tslib_1.__exportStar(require("./callHierarchy/callHierarchy.service"), exports);
|
|
6
|
+
tslib_1.__exportStar(require("./typeHierarchy/typeHierarchy.contribution"), exports);
|
|
7
|
+
tslib_1.__exportStar(require("./typeHierarchy/typeHierarchy.service"), exports);
|
|
6
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/monaco-contrib/index.ts"],"names":[],"mappings":";;;AAAA,qFAA2D;AAC3D,gFAAsD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/monaco-contrib/index.ts"],"names":[],"mappings":";;;AAAA,qFAA2D;AAC3D,gFAAsD;AACtD,qFAA2D;AAC3D,gFAAsD"}
|