@opensumi/ide-opened-editor 3.1.2-next-1718700994.0 → 3.1.2-next-1718701452.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.
Files changed (15) hide show
  1. package/lib/browser/opened-editor-node.define.d.ts +0 -5
  2. package/lib/browser/opened-editor-node.define.d.ts.map +1 -1
  3. package/lib/browser/opened-editor-node.define.js +3 -11
  4. package/lib/browser/opened-editor-node.define.js.map +1 -1
  5. package/lib/browser/services/opened-editor-model.service.d.ts.map +1 -1
  6. package/lib/browser/services/opened-editor-model.service.js +6 -2
  7. package/lib/browser/services/opened-editor-model.service.js.map +1 -1
  8. package/lib/browser/services/opened-editor-tree.service.d.ts +1 -1
  9. package/lib/browser/services/opened-editor-tree.service.d.ts.map +1 -1
  10. package/lib/browser/services/opened-editor-tree.service.js +27 -12
  11. package/lib/browser/services/opened-editor-tree.service.js.map +1 -1
  12. package/package.json +13 -13
  13. package/src/browser/opened-editor-node.define.ts +3 -13
  14. package/src/browser/services/opened-editor-model.service.ts +8 -4
  15. package/src/browser/services/opened-editor-tree.service.ts +34 -23
package/lib/browser/opened-editor-node.define.d.ts CHANGED
@@ -8,12 +8,8 @@ export declare class EditorFileRoot extends CompositeTreeNode {
8
8
  constructor(tree: OpenedEditorService);
9
9
  get expanded(): boolean;
10
10
  }
11
- /**
12
- * EditorFileGroup 节点不包含父节点, 同时默认为展开状态
13
- */
14
11
  export declare class EditorFileGroup extends CompositeTreeNode {
15
12
  readonly group: IEditorGroup;
16
- static makeName(groupIndex: number): string;
17
13
  static isEditorGroup(data: OpenedEditorData): data is IEditorGroup;
18
14
  static is(node: EditorFileGroup | EditorFile): node is EditorFileGroup;
19
15
  private groupIndex;
@@ -29,7 +25,6 @@ export declare class EditorFile extends TreeNode {
29
25
  tooltip: string;
30
26
  dirty: boolean;
31
27
  static is(node: any): node is EditorFile;
32
- static makeName(uri: URI): string;
33
28
  constructor(tree: OpenedEditorService, resource: IResource, tooltip: string, dirty: boolean, parent: EditorFileGroup | undefined);
34
29
  get displayName(): string;
35
30
  get uri(): URI;
package/lib/browser/opened-editor-node.define.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-node.define.d.ts","sourceRoot":"","sources":["../../src/browser/opened-editor-node.define.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAS,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAE,GAAG,EAAkB,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE5E,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,CAAC;AAExD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,GAAG,IAAI,IAAI,cAAc;gBAI7D,IAAI,EAAE,mBAAmB;IAIrC,IAAI,QAAQ,YAEX;CACF;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,iBAAiB;aAeG,KAAK,EAAE,YAAY;IAd1E,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAIlC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,IAAI,YAAY;IAIlE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI,IAAI,eAAe;IAItE,OAAO,CAAC,UAAU,CAAS;gBAEf,IAAI,EAAE,mBAAmB,EAAkB,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc;IAKlG,IAAI,QAAQ,YAEX;IAED,IAAI,IAAI,WAEP;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,OAAO;CAGR;AAED,qBAAa,UAAW,SAAQ,QAAQ;aAWpB,QAAQ,EAAE,SAAS;IAC5B,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,OAAO;WAZT,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,UAAU;IAI/C,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG;gBAKtB,IAAI,EAAE,mBAAmB,EACT,QAAQ,EAAE,SAAS,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAe,EAC7B,MAAM,EAAE,eAAe,GAAG,SAAS;IAKrC,IAAI,WAAW,WAEd;IAED,IAAI,GAAG,QAEN;CACF"}
1
+ {"version":3,"file":"opened-editor-node.define.d.ts","sourceRoot":"","sources":["../../src/browser/opened-editor-node.define.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAS,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAE,GAAG,EAAkB,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE5E,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,CAAC;AAExD,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,GAAG,IAAI,IAAI,cAAc;gBAI7D,IAAI,EAAE,mBAAmB;IAIrC,IAAI,QAAQ,YAEX;CACF;AAGD,qBAAa,eAAgB,SAAQ,iBAAiB;aAWG,KAAK,EAAE,YAAY;IAV1E,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,IAAI,YAAY;IAIlE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI,IAAI,eAAe;IAItE,OAAO,CAAC,UAAU,CAAS;gBAEf,IAAI,EAAE,mBAAmB,EAAkB,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc;IAKlG,IAAI,QAAQ,YAEX;IAED,IAAI,IAAI,WAEP;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,OAAO;CAGR;AAED,qBAAa,UAAW,SAAQ,QAAQ;aAOpB,QAAQ,EAAE,SAAS;IAC5B,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,OAAO;WART,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,UAAU;gBAK7C,IAAI,EAAE,mBAAmB,EACT,QAAQ,EAAE,SAAS,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAe,EAC7B,MAAM,EAAE,eAAe,GAAG,SAAS;IAKrC,IAAI,WAAW,WAEd;IAED,IAAI,GAAG,QAEN;CACF"}
package/lib/browser/opened-editor-node.define.js CHANGED
@@ -15,13 +15,8 @@ class EditorFileRoot extends ide_components_1.CompositeTreeNode {
15
15
  }
16
16
  }
17
17
  exports.EditorFileRoot = EditorFileRoot;
18
- /**
19
- * EditorFileGroup 节点不包含父节点, 同时默认为展开状态
20
- */
18
+ // EditorFileGroup 节点不包含父节点, 同时默认为展开状态
21
19
  class EditorFileGroup extends ide_components_1.CompositeTreeNode {
22
- static makeName(groupIndex) {
23
- return (0, ide_core_browser_1.formatLocalize)('opened.editors.group.title', groupIndex + 1);
24
- }
25
20
  static isEditorGroup(data) {
26
21
  return typeof data.resources !== 'undefined';
27
22
  }
@@ -37,7 +32,7 @@ class EditorFileGroup extends ide_components_1.CompositeTreeNode {
37
32
  return true;
38
33
  }
39
34
  get name() {
40
- return EditorFileGroup.makeName(this.groupIndex);
35
+ return (0, ide_core_browser_1.formatLocalize)('opened.editors.group.title', this.groupIndex + 1);
41
36
  }
42
37
  get displayName() {
43
38
  return this.name;
@@ -54,11 +49,8 @@ class EditorFile extends ide_components_1.TreeNode {
54
49
  static is(node) {
55
50
  return ide_components_1.TreeNode.is(node) && 'uri' in node;
56
51
  }
57
- static makeName(uri) {
58
- return uri.toString().replace(/\//g, '_');
59
- }
60
52
  constructor(tree, resource, tooltip, dirty = false, parent) {
61
- super(tree, parent, undefined, { name: EditorFile.makeName(resource.uri) });
53
+ super(tree, parent, undefined, { name: `${resource.uri.toString()}` });
62
54
  this.resource = resource;
63
55
  this.tooltip = tooltip;
64
56
  this.dirty = dirty;
package/lib/browser/opened-editor-node.define.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-node.define.js","sourceRoot":"","sources":["../../src/browser/opened-editor-node.define.ts"],"names":[],"mappings":";;;AAAA,6DAA8E;AAC9E,iEAAiE;AAOjE,MAAa,cAAe,SAAQ,kCAAiB;IACnD,MAAM,CAAC,EAAE,CAAC,IAAsC;QAC9C,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,YAAY,IAAyB;QACnC,KAAK,CAAC,IAAa,EAAE,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAZD,wCAYC;AAED;;GAEG;AACH,MAAa,eAAgB,SAAQ,kCAAiB;IACpD,MAAM,CAAC,QAAQ,CAAC,UAAkB;QAChC,OAAO,IAAA,iCAAc,EAAC,4BAA4B,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAsB;QACzC,OAAO,OAAQ,IAAY,CAAC,SAAS,KAAK,WAAW,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,IAAkC;QAC1C,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAE,IAAwB,CAAC,KAAK,CAAC;IACrD,CAAC;IAID,YAAY,IAAyB,EAAkB,KAAmB,EAAE,MAAsB;QAChG,KAAK,CAAC,IAAa,EAAE,MAAM,CAAC,CAAC;QADwB,UAAK,GAAL,KAAK,CAAc;QAExE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IACrC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI;QACN,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAvCD,0CAuCC;AAED,MAAa,UAAW,SAAQ,yBAAQ;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAS;QACxB,OAAO,yBAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAQ;QACtB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC;IAED,YACE,IAAyB,EACT,QAAmB,EAC5B,OAAe,EACf,QAAiB,KAAK,EAC7B,MAAmC;QAEnC,KAAK,CAAC,IAAa,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QALrE,aAAQ,GAAR,QAAQ,CAAW;QAC5B,YAAO,GAAP,OAAO,CAAQ;QACf,UAAK,GAAL,KAAK,CAAiB;IAI/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,sBAAG,EAAE,CAAC;IACvD,CAAC;CACF;AA1BD,gCA0BC"}
1
+ {"version":3,"file":"opened-editor-node.define.js","sourceRoot":"","sources":["../../src/browser/opened-editor-node.define.ts"],"names":[],"mappings":";;;AAAA,6DAA8E;AAC9E,iEAAiE;AAOjE,MAAa,cAAe,SAAQ,kCAAiB;IACnD,MAAM,CAAC,EAAE,CAAC,IAAsC;QAC9C,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,YAAY,IAAyB;QACnC,KAAK,CAAC,IAAa,EAAE,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAZD,wCAYC;AAED,sCAAsC;AACtC,MAAa,eAAgB,SAAQ,kCAAiB;IACpD,MAAM,CAAC,aAAa,CAAC,IAAsB;QACzC,OAAO,OAAQ,IAAY,CAAC,SAAS,KAAK,WAAW,CAAC;IACxD,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,IAAkC;QAC1C,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAE,IAAwB,CAAC,KAAK,CAAC;IACrD,CAAC;IAID,YAAY,IAAyB,EAAkB,KAAmB,EAAE,MAAsB;QAChG,KAAK,CAAC,IAAa,EAAE,MAAM,CAAC,CAAC;QADwB,UAAK,GAAL,KAAK,CAAc;QAExE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IACrC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAA,iCAAc,EAAC,4BAA4B,EAAE,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAnCD,0CAmCC;AAED,MAAa,UAAW,SAAQ,yBAAQ;IAC/B,MAAM,CAAC,EAAE,CAAC,IAAS;QACxB,OAAO,yBAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC;IAC5C,CAAC;IAED,YACE,IAAyB,EACT,QAAmB,EAC5B,OAAe,EACf,QAAiB,KAAK,EAC7B,MAAmC;QAEnC,KAAK,CAAC,IAAa,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QALhE,aAAQ,GAAR,QAAQ,CAAW;QAC5B,YAAO,GAAP,OAAO,CAAQ;QACf,UAAK,GAAL,KAAK,CAAiB;IAI/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,sBAAG,EAAE,CAAC;IACvD,CAAC;CACF;AAtBD,gCAsBC"}
package/lib/browser/services/opened-editor-model.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-model.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-model.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"opened-editor-model.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-model.service.ts"],"names":[],"mappings":"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"}
package/lib/browser/services/opened-editor-model.service.js CHANGED
@@ -12,7 +12,6 @@ const browser_1 = require("@opensumi/ide-editor/lib/browser");
12
12
  const workbench_editor_service_1 = require("@opensumi/ide-editor/lib/browser/workbench-editor.service");
13
13
  const explorer_contribution_1 = require("@opensumi/ide-explorer/lib/browser/explorer-contribution");
14
14
  const ide_main_layout_1 = require("@opensumi/ide-main-layout");
15
- const path_1 = require("@opensumi/ide-utils/lib/path");
16
15
  const index_1 = require("../../common/index");
17
16
  const opened_editor_node_define_1 = require("../opened-editor-node.define");
18
17
  const opened_editor_node_module_less_1 = tslib_1.__importDefault(require("../opened-editor-node.module.less"));
@@ -20,6 +19,7 @@ const opened_editor_decoration_service_1 = require("./opened-editor-decoration.s
20
19
  const opened_editor_event_service_1 = require("./opened-editor-event.service");
21
20
  const opened_editor_model_1 = require("./opened-editor-model");
22
21
  const opened_editor_tree_service_1 = require("./opened-editor-tree.service");
22
+ const { Path } = ide_core_browser_1.path;
23
23
  let OpenedEditorModelService = OpenedEditorModelService_1 = class OpenedEditorModelService {
24
24
  constructor() {
25
25
  this._changeEventDispatchQueue = [];
@@ -128,7 +128,11 @@ let OpenedEditorModelService = OpenedEditorModelService_1 = class OpenedEditorMo
128
128
  if (!this._changeEventDispatchQueue || this._changeEventDispatchQueue.length === 0) {
129
129
  return;
130
130
  }
131
- this._changeEventDispatchQueue = (0, path_1.sortPathByDepth)(this._changeEventDispatchQueue);
131
+ this._changeEventDispatchQueue.sort((pathA, pathB) => {
132
+ const pathADepth = Path.pathDepth(pathA);
133
+ const pathBDepth = Path.pathDepth(pathB);
134
+ return pathADepth - pathBDepth;
135
+ });
132
136
  const roots = [this._changeEventDispatchQueue[0]];
133
137
  for (const path of this._changeEventDispatchQueue) {
134
138
  if (roots.some((root) => path.indexOf(root) === 0)) {
package/lib/browser/services/opened-editor-model.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-model.service.js","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-model.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"opened-editor-model.service.js","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-model.service.ts"],"names":[],"mappings":"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"}
package/lib/browser/services/opened-editor-tree.service.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare class OpenedEditorService extends Tree {
14
14
  addDirtyUri(uri: string): void;
15
15
  removeDirtyUri(uri: string): void;
16
16
  resolveChildren(parent?: EditorFileRoot | EditorFileGroup): Promise<(EditorFileGroup | EditorFileRoot | EditorFile)[]>;
17
- sortComparator: (a: ITreeNodeOrCompositeTreeNode, b: ITreeNodeOrCompositeTreeNode) => number;
17
+ sortComparator: (a: ITreeNodeOrCompositeTreeNode, b: ITreeNodeOrCompositeTreeNode) => any;
18
18
  getEditorNodeByUri(resource?: IResource | URI, group?: IEditorGroup): import("@opensumi/ide-components").ITreeNode | undefined;
19
19
  /**
20
20
  * 获取相对路径的Tooltip
package/lib/browser/services/opened-editor-tree.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-tree.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,IAAI,EAAgB,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAW,GAAG,EAAQ,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,SAAS,EAA2C,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAoB,MAAM,8BAA8B,CAAC;AAI7G,qBACa,mBAAoB,SAAQ,IAAI;IAE3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAErD,SACgB,YAAY,EAAE,YAAY,CAAC;IAG3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAElD,OAAO,CAAC,SAAS,CAAqB;IAGtC,OAAO,CAAC,YAAY,CAAS;IAE7B,IAAI,WAAW,YAEd;IAED,WAAW,CAAC,GAAG,EAAE,MAAM;IAMvB,cAAc,CAAC,GAAG,EAAE,MAAM;IAIpB,eAAe,CACnB,MAAM,CAAC,EAAE,cAAc,GAAG,eAAe,GACxC,OAAO,CAAC,CAAC,eAAe,GAAG,cAAc,GAAG,UAAU,CAAC,EAAE,CAAC;IAyC7D,cAAc,MAAO,4BAA4B,KAAK,4BAA4B,YAuBhF;IAEK,kBAAkB,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,GAAG,EAAE,KAAK,CAAC,EAAE,YAAY;IA8B1E;;;;;;OAMG;IACU,kBAAkB,CAAC,IAAI,EAAE,GAAG;CAa1C"}
1
+ {"version":3,"file":"opened-editor-tree.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-tree.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,IAAI,EAAgB,MAAM,0BAA0B,CAAC;AAC5F,OAAO,EAAW,GAAG,EAAwB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,SAAS,EAA2C,MAAM,sBAAsB,CAAC;AAGxG,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAoB,MAAM,8BAA8B,CAAC;AAI7G,qBACa,mBAAoB,SAAQ,IAAI;IAE3C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAGhE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAErD,SACgB,YAAY,EAAE,YAAY,CAAC;IAG3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAElD,OAAO,CAAC,SAAS,CAAgB;IAGjC,OAAO,CAAC,YAAY,CAAS;IAE7B,IAAI,WAAW,YAEd;IAED,WAAW,CAAC,GAAG,EAAE,MAAM;IAMvB,cAAc,CAAC,GAAG,EAAE,MAAM;IAOpB,eAAe,CACnB,MAAM,CAAC,EAAE,cAAc,GAAG,eAAe,GACxC,OAAO,CAAC,CAAC,eAAe,GAAG,cAAc,GAAG,UAAU,CAAC,EAAE,CAAC;IA2C7D,cAAc,MAAO,4BAA4B,KAAK,4BAA4B,SAuBhF;IAEK,kBAAkB,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,GAAG,EAAE,KAAK,CAAC,EAAE,YAAY;IAoC1E;;;;;;OAMG;IACU,kBAAkB,CAAC,IAAI,EAAE,GAAG;CAa1C"}
package/lib/browser/services/opened-editor-tree.service.js CHANGED
@@ -13,7 +13,7 @@ const { Path } = ide_core_browser_1.path;
13
13
  let OpenedEditorService = class OpenedEditorService extends ide_components_1.Tree {
14
14
  constructor() {
15
15
  super(...arguments);
16
- this._dirtyUri = new Set();
16
+ this._dirtyUri = [];
17
17
  // 是否为分组的节点树
18
18
  this._isGroupTree = false;
19
19
  this.sortComparator = (a, b) => {
@@ -42,12 +42,15 @@ let OpenedEditorService = class OpenedEditorService extends ide_components_1.Tre
42
42
  return this._isGroupTree;
43
43
  }
44
44
  addDirtyUri(uri) {
45
- if (!this._dirtyUri.has(uri)) {
46
- this._dirtyUri.add(uri);
45
+ if (!this._dirtyUri.includes(uri)) {
46
+ this._dirtyUri.push(uri);
47
47
  }
48
48
  }
49
49
  removeDirtyUri(uri) {
50
- this._dirtyUri.delete(uri);
50
+ if (this._dirtyUri.includes(uri)) {
51
+ const index = this._dirtyUri.findIndex((value) => value === uri);
52
+ this._dirtyUri.splice(index, 1);
53
+ }
51
54
  }
52
55
  async resolveChildren(parent) {
53
56
  let children = [];
@@ -68,7 +71,7 @@ let OpenedEditorService = class OpenedEditorService extends ide_components_1.Tre
68
71
  for (const item of groupOrResource) {
69
72
  if (!item.resources) {
70
73
  const tooltip = await this.getReadableTooltip(item.uri);
71
- children.push(new opened_editor_node_define_1.EditorFile(this, item, tooltip, this._dirtyUri.has(item.uri.toString()), parent));
74
+ children.push(new opened_editor_node_define_1.EditorFile(this, item, tooltip, this._dirtyUri.includes(item.uri.toString()), parent));
72
75
  }
73
76
  else {
74
77
  this._isGroupTree = true;
@@ -80,31 +83,43 @@ let OpenedEditorService = class OpenedEditorService extends ide_components_1.Tre
80
83
  else {
81
84
  for (const resource of parent.group.resources) {
82
85
  const tooltip = await this.getReadableTooltip(resource.uri);
83
- children.push(new opened_editor_node_define_1.EditorFile(this, resource, tooltip, this._dirtyUri.has(resource.uri.toString()), parent));
86
+ children.push(new opened_editor_node_define_1.EditorFile(this, resource, tooltip, this._dirtyUri.includes(resource.uri.toString()), parent));
84
87
  }
85
88
  }
86
89
  return children;
87
90
  }
88
91
  getEditorNodeByUri(resource, group) {
92
+ var _a, _b;
93
+ let path = this.root.path;
89
94
  if (resource) {
90
- let path;
91
95
  if (this._isGroupTree) {
92
96
  if (!group) {
93
97
  return;
94
98
  }
95
- path = this.root.joinPath(opened_editor_node_define_1.EditorFileGroup.makeName(group.index), opened_editor_node_define_1.EditorFile.makeName(resource && resource.uri ? resource.uri : resource));
99
+ const groupName = (0, ide_core_browser_1.formatLocalize)('opened.editors.group.title', group.index + 1);
100
+ path = new Path(path)
101
+ .join(groupName)
102
+ .join(resource && resource.uri
103
+ ? resource.uri.toString()
104
+ : resource.toString())
105
+ .toString();
96
106
  }
97
107
  else {
98
- path = this.root.joinPath(opened_editor_node_define_1.EditorFile.makeName(resource && resource.uri ? resource.uri : resource));
108
+ path = new Path(path)
109
+ .join(resource && resource.uri
110
+ ? resource.uri.toString()
111
+ : resource.toString())
112
+ .toString();
99
113
  }
100
- return this.root.getTreeNodeByPath(path);
114
+ return (_a = this.root) === null || _a === void 0 ? void 0 : _a.getTreeNodeByPath(path);
101
115
  }
102
116
  else {
103
117
  if (!group) {
104
118
  return;
105
119
  }
106
- const path = this.root.joinPath(opened_editor_node_define_1.EditorFileGroup.makeName(group.index));
107
- return this.root.getTreeNodeByPath(path);
120
+ const groupName = (0, ide_core_browser_1.formatLocalize)('opened.editors.group.title', group.index + 1);
121
+ path = new Path(path).join(groupName).toString();
122
+ return (_b = this.root) === null || _b === void 0 ? void 0 : _b.getTreeNodeByPath(path);
108
123
  }
109
124
  }
110
125
  /**
package/lib/browser/services/opened-editor-tree.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opened-editor-tree.service.js","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-tree.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"opened-editor-tree.service.js","sourceRoot":"","sources":["../../../src/browser/services/opened-editor-tree.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,6DAA4F;AAC5F,iEAAgF;AAChF,sEAAuE;AACvE,qDAAwG;AACxG,2DAA4D;AAE5D,4EAA6G;AAE7G,MAAM,EAAE,IAAI,EAAE,GAAG,uBAAI,CAAC;AAGf,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,qBAAI;IAAtC;;QAaG,cAAS,GAAa,EAAE,CAAC;QAEjC,YAAY;QACJ,iBAAY,GAAG,KAAK,CAAC;QAgE7B,mBAAc,GAAG,CAAC,CAA+B,EAAE,CAA+B,EAAE,EAAE;YACpF,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,EAAE;gBACnC,IAAK,CAAgB,CAAC,QAAQ,IAAK,CAAgB,CAAC,QAAQ,EAAE;oBAC5D,MAAM,MAAM,GAAI,CAAgB,CAAC,MAAyB,CAAC;oBAC3D,IAAI,MAAM,IAAI,2CAAe,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;wBACxC,OAAO,CACL,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAE,CAAgB,CAAC,QAAQ,CAAC;4BAC1D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAE,CAAgB,CAAC,QAAQ,CAAC,CAC3D,CAAC;qBACH;yBAAM;wBACL,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC;wBACpE,IAAI,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;4BAC1C,OAAO,CACL,YAAY,CAAC,SAAS,CAAC,OAAO,CAAE,CAAgB,CAAC,QAAQ,CAAC;gCAC1D,YAAY,CAAC,SAAS,CAAC,OAAO,CAAE,CAAgB,CAAC,QAAQ,CAAC,CAC3D,CAAC;yBACH;qBACF;iBACF;gBACD,yBAAyB;gBACzB,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAQ,CAAC;aACrE;YACD,OAAO,CAAC,CAAC,IAAI,KAAK,6BAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,6BAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5G,CAAC,CAAC;IA0DJ,CAAC;IA/IC,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;IACH,CAAC;IAED,cAAc,CAAC,GAAW;QACxB,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAC;YACjE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,MAAyC;QAEzC,IAAI,QAAQ,GAAsD,EAAE,CAAC;QACrE,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,KAAK,GAAG,IAAI,0CAAc,CAAC,IAAI,CAAC,CAAC;YACtC,QAAQ,GAAG,CAAC,IAAI,CAAC,KAAuB,CAAC,CAAC;SAC3C;aAAM,IAAI,0CAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACpC,uBAAuB;YACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,eAAe,GAAuB,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC9D,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;aACvF;iBAAM;gBACL,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC;aAClE;YACD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;gBAClC,IAAI,CAAE,IAAqB,CAAC,SAAS,EAAE;oBACrC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAE,IAAkB,CAAC,GAAG,CAAC,CAAC;oBACvE,QAAQ,CAAC,IAAI,CACX,IAAI,sCAAU,CACZ,IAAI,EACJ,IAAiB,EACjB,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAE,IAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAC3D,MAAyB,CAC1B,CACF,CAAC;iBACH;qBAAM;oBACL,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;oBACzB,MAAM,SAAS,GAAG,IAAI,2CAAe,CAAC,IAAI,EAAE,IAAoB,EAAE,MAAM,CAAC,CAAC;oBAC1E,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC1B;aACF;SACF;aAAM;YACL,KAAK,MAAM,QAAQ,IAAK,MAA0B,CAAC,KAAK,CAAC,SAAS,EAAE;gBAClE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC5D,QAAQ,CAAC,IAAI,CACX,IAAI,sCAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC,CAClG,CAAC;aACH;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IA2BM,kBAAkB,CAAC,QAA0B,EAAE,KAAoB;;QACxE,IAAI,IAAI,GAAG,IAAI,CAAC,IAAK,CAAC,IAAI,CAAC;QAC3B,IAAI,QAAQ,EAAE;YACZ,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO;iBACR;gBACD,MAAM,SAAS,GAAG,IAAA,iCAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAChF,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC;qBAClB,IAAI,CAAC,SAAS,CAAC;qBACf,IAAI,CACH,QAAQ,IAAK,QAAsB,CAAC,GAAG;oBACrC,CAAC,CAAE,QAAsB,CAAC,GAAG,CAAC,QAAQ,EAAE;oBACxC,CAAC,CAAE,QAAgB,CAAC,QAAQ,EAAE,CACjC;qBACA,QAAQ,EAAE,CAAC;aACf;iBAAM;gBACL,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC;qBAClB,IAAI,CACH,QAAQ,IAAK,QAAsB,CAAC,GAAG;oBACrC,CAAC,CAAE,QAAsB,CAAC,GAAG,CAAC,QAAQ,EAAE;oBACxC,CAAC,CAAE,QAAgB,CAAC,QAAQ,EAAE,CACjC;qBACA,QAAQ,EAAE,CAAC;aACf;YACD,OAAO,MAAA,IAAI,CAAC,IAAI,0CAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC3C;aAAM;YACL,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO;aACR;YACD,MAAM,SAAS,GAAG,IAAA,iCAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAChF,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;YACjD,OAAO,MAAA,IAAI,CAAC,IAAI,0CAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;SAC3C;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAAC,IAAS;;QACvC,IAAI,IAAI,CAAC,MAAM,KAAK,0BAAO,CAAC,IAAI,EAAE;YAChC,OAAO,EAAE,CAAC;SACX;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;QAChD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,OAAO,GAAG,IAAI,sBAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBACjC,OAAO,kBAAkB,CAAC,MAAA,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,QAAQ,EAAG,CAAC,CAAC;aAChE;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CACF,CAAA;AAhKC;IAAC,IAAA,cAAS,EAAC,mCAAsB,CAAC;sCACO,mCAAsB;mEAAC;AAEhE;IAAC,IAAA,cAAS,EAAC,iCAAiB,CAAC;;6DACwB;AAErD;IAAC,IAAA,cAAS,EAAC,uBAAY,CAAC;sCACM,uBAAY;yDAAC;AAE3C;IAAC,IAAA,cAAS,EAAC,4BAAe,CAAC;sCACO,4BAAe;4DAAC;AAXvC,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CAiK/B;AAjKY,kDAAmB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-opened-editor",
3
- "version": "3.1.2-next-1718700994.0",
3
+ "version": "3.1.2-next-1718701452.0",
4
4
  "files": [
5
5
  "lib",
6
6
  "src"
@@ -17,17 +17,17 @@
17
17
  "url": "git@github.com:opensumi/core.git"
18
18
  },
19
19
  "devDependencies": {
20
- "@opensumi/ide-components": "3.1.2-next-1718700994.0",
21
- "@opensumi/ide-core-browser": "3.1.2-next-1718700994.0",
22
- "@opensumi/ide-core-common": "3.1.2-next-1718700994.0",
23
- "@opensumi/ide-decoration": "3.1.2-next-1718700994.0",
24
- "@opensumi/ide-dev-tool": "3.1.2-next-1718700994.0",
25
- "@opensumi/ide-editor": "3.1.2-next-1718700994.0",
26
- "@opensumi/ide-explorer": "3.1.2-next-1718700994.0",
27
- "@opensumi/ide-main-layout": "3.1.2-next-1718700994.0",
28
- "@opensumi/ide-theme": "3.1.2-next-1718700994.0",
29
- "@opensumi/ide-webview": "3.1.2-next-1718700994.0",
30
- "@opensumi/ide-workspace": "3.1.2-next-1718700994.0"
20
+ "@opensumi/ide-components": "3.1.2-next-1718701452.0",
21
+ "@opensumi/ide-core-browser": "3.1.2-next-1718701452.0",
22
+ "@opensumi/ide-core-common": "3.1.2-next-1718701452.0",
23
+ "@opensumi/ide-decoration": "3.1.2-next-1718701452.0",
24
+ "@opensumi/ide-dev-tool": "3.1.2-next-1718701452.0",
25
+ "@opensumi/ide-editor": "3.1.2-next-1718701452.0",
26
+ "@opensumi/ide-explorer": "3.1.2-next-1718701452.0",
27
+ "@opensumi/ide-main-layout": "3.1.2-next-1718701452.0",
28
+ "@opensumi/ide-theme": "3.1.2-next-1718701452.0",
29
+ "@opensumi/ide-webview": "3.1.2-next-1718701452.0",
30
+ "@opensumi/ide-workspace": "3.1.2-next-1718701452.0"
31
31
  },
32
- "gitHead": "14fdc10852a2d0bbebbe9b42acc1194d38d51abb"
32
+ "gitHead": "7d2e1724fee5f12299ef140f778b0d653671c694"
33
33
  }
package/src/browser/opened-editor-node.define.ts CHANGED
@@ -20,14 +20,8 @@ export class EditorFileRoot extends CompositeTreeNode {
20
20
  }
21
21
  }
22
22
 
23
- /**
24
- * EditorFileGroup 节点不包含父节点, 同时默认为展开状态
25
- */
23
+ // EditorFileGroup 节点不包含父节点, 同时默认为展开状态
26
24
  export class EditorFileGroup extends CompositeTreeNode {
27
- static makeName(groupIndex: number) {
28
- return formatLocalize('opened.editors.group.title', groupIndex + 1);
29
- }
30
-
31
25
  static isEditorGroup(data: OpenedEditorData): data is IEditorGroup {
32
26
  return typeof (data as any).resources !== 'undefined';
33
27
  }
@@ -48,7 +42,7 @@ export class EditorFileGroup extends CompositeTreeNode {
48
42
  }
49
43
 
50
44
  get name() {
51
- return EditorFileGroup.makeName(this.groupIndex);
45
+ return formatLocalize('opened.editors.group.title', this.groupIndex + 1);
52
46
  }
53
47
 
54
48
  get displayName() {
@@ -69,10 +63,6 @@ export class EditorFile extends TreeNode {
69
63
  return TreeNode.is(node) && 'uri' in node;
70
64
  }
71
65
 
72
- static makeName(uri: URI) {
73
- return uri.toString().replace(/\//g, '_');
74
- }
75
-
76
66
  constructor(
77
67
  tree: OpenedEditorService,
78
68
  public readonly resource: IResource,
@@ -80,7 +70,7 @@ export class EditorFile extends TreeNode {
80
70
  public dirty: boolean = false,
81
71
  parent: EditorFileGroup | undefined,
82
72
  ) {
83
- super(tree as ITree, parent, undefined, { name: EditorFile.makeName(resource.uri) });
73
+ super(tree as ITree, parent, undefined, { name: `${resource.uri.toString()}` });
84
74
  }
85
75
 
86
76
  get displayName() {
package/src/browser/services/opened-editor-model.service.ts CHANGED
@@ -12,6 +12,7 @@ import {
12
12
  URI,
13
13
  formatLocalize,
14
14
  pSeries,
15
+ path,
15
16
  } from '@opensumi/ide-core-browser';
16
17
  import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
17
18
  import { LabelService } from '@opensumi/ide-core-browser/lib/services';
@@ -19,7 +20,6 @@ import { IEditorGroup, IResource, WorkbenchEditorService } from '@opensumi/ide-e
19
20
  import { WorkbenchEditorServiceImpl } from '@opensumi/ide-editor/lib/browser/workbench-editor.service';
20
21
  import { EXPLORER_CONTAINER_ID } from '@opensumi/ide-explorer/lib/browser/explorer-contribution';
21
22
  import { IMainLayoutService } from '@opensumi/ide-main-layout';
22
- import { sortPathByDepth } from '@opensumi/ide-utils/lib/path';
23
23
 
24
24
  import { ExplorerOpenedEditorViewId } from '../../common/index';
25
25
  import { EditorFile, EditorFileGroup } from '../opened-editor-node.define';
@@ -30,6 +30,8 @@ import { OpenedEditorEventService } from './opened-editor-event.service';
30
30
  import { OpenedEditorModel } from './opened-editor-model';
31
31
  import { OpenedEditorService } from './opened-editor-tree.service';
32
32
 
33
+ const { Path } = path;
34
+
33
35
  export interface IEditorTreeHandle extends IRecycleTreeHandle {
34
36
  hasDirectFocus: () => boolean;
35
37
  }
@@ -385,9 +387,11 @@ export class OpenedEditorModelService {
385
387
  if (!this._changeEventDispatchQueue || this._changeEventDispatchQueue.length === 0) {
386
388
  return;
387
389
  }
388
-
389
- this._changeEventDispatchQueue = sortPathByDepth(this._changeEventDispatchQueue);
390
-
390
+ this._changeEventDispatchQueue.sort((pathA, pathB) => {
391
+ const pathADepth = Path.pathDepth(pathA);
392
+ const pathBDepth = Path.pathDepth(pathB);
393
+ return pathADepth - pathBDepth;
394
+ });
391
395
  const roots = [this._changeEventDispatchQueue[0]];
392
396
  for (const path of this._changeEventDispatchQueue) {
393
397
  if (roots.some((root) => path.indexOf(root) === 0)) {
package/src/browser/services/opened-editor-tree.service.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Autowired, Injectable } from '@opensumi/di';
2
2
  import { ITreeNodeOrCompositeTreeNode, Tree, TreeNodeType } from '@opensumi/ide-components';
3
- import { Schemes, URI, path } from '@opensumi/ide-core-browser';
3
+ import { Schemes, URI, formatLocalize, path } from '@opensumi/ide-core-browser';
4
4
  import { LabelService } from '@opensumi/ide-core-browser/lib/services';
5
5
  import { IEditorGroup, IResource, ResourceService, WorkbenchEditorService } from '@opensumi/ide-editor';
6
6
  import { IWorkspaceService } from '@opensumi/ide-workspace';
@@ -23,7 +23,7 @@ export class OpenedEditorService extends Tree {
23
23
  @Autowired(ResourceService)
24
24
  private readonly resourceService: ResourceService;
25
25
 
26
- private _dirtyUri = new Set<string>();
26
+ private _dirtyUri: string[] = [];
27
27
 
28
28
  // 是否为分组的节点树
29
29
  private _isGroupTree = false;
@@ -33,13 +33,16 @@ export class OpenedEditorService extends Tree {
33
33
  }
34
34
 
35
35
  addDirtyUri(uri: string) {
36
- if (!this._dirtyUri.has(uri)) {
37
- this._dirtyUri.add(uri);
36
+ if (!this._dirtyUri.includes(uri)) {
37
+ this._dirtyUri.push(uri);
38
38
  }
39
39
  }
40
40
 
41
41
  removeDirtyUri(uri: string) {
42
- this._dirtyUri.delete(uri);
42
+ if (this._dirtyUri.includes(uri)) {
43
+ const index = this._dirtyUri.findIndex((value) => value === uri);
44
+ this._dirtyUri.splice(index, 1);
45
+ }
43
46
  }
44
47
 
45
48
  async resolveChildren(
@@ -66,7 +69,7 @@ export class OpenedEditorService extends Tree {
66
69
  this,
67
70
  item as IResource,
68
71
  tooltip,
69
- this._dirtyUri.has((item as IResource).uri.toString()),
72
+ this._dirtyUri.includes((item as IResource).uri.toString()),
70
73
  parent as EditorFileGroup,
71
74
  ),
72
75
  );
@@ -79,7 +82,9 @@ export class OpenedEditorService extends Tree {
79
82
  } else {
80
83
  for (const resource of (parent as EditorFileGroup).group.resources) {
81
84
  const tooltip = await this.getReadableTooltip(resource.uri);
82
- children.push(new EditorFile(this, resource, tooltip, this._dirtyUri.has(resource.uri.toString()), parent));
85
+ children.push(
86
+ new EditorFile(this, resource, tooltip, this._dirtyUri.includes(resource.uri.toString()), parent),
87
+ );
83
88
  }
84
89
  }
85
90
  return children;
@@ -105,38 +110,44 @@ export class OpenedEditorService extends Tree {
105
110
  }
106
111
  }
107
112
  // numeric 参数确保数字为第一排序优先级
108
- return a.name.localeCompare(b.name, 'kn', { numeric: true });
113
+ return a.name.localeCompare(b.name, 'kn', { numeric: true }) as any;
109
114
  }
110
115
  return a.type === TreeNodeType.CompositeTreeNode ? -1 : b.type === TreeNodeType.CompositeTreeNode ? 1 : 0;
111
116
  };
112
117
 
113
118
  public getEditorNodeByUri(resource?: IResource | URI, group?: IEditorGroup) {
119
+ let path = this.root!.path;
114
120
  if (resource) {
115
- let path: string;
116
121
  if (this._isGroupTree) {
117
122
  if (!group) {
118
123
  return;
119
124
  }
120
- path = this.root!.joinPath(
121
- EditorFileGroup.makeName(group.index),
122
- EditorFile.makeName(
123
- resource && (resource as IResource).uri ? (resource as IResource).uri : (resource as URI),
124
- ),
125
- );
125
+ const groupName = formatLocalize('opened.editors.group.title', group.index + 1);
126
+ path = new Path(path)
127
+ .join(groupName)
128
+ .join(
129
+ resource && (resource as IResource).uri
130
+ ? (resource as IResource).uri.toString()
131
+ : (resource as URI).toString(),
132
+ )
133
+ .toString();
126
134
  } else {
127
- path = this.root!.joinPath(
128
- EditorFile.makeName(
129
- resource && (resource as IResource).uri ? (resource as IResource).uri : (resource as URI),
130
- ),
131
- );
135
+ path = new Path(path)
136
+ .join(
137
+ resource && (resource as IResource).uri
138
+ ? (resource as IResource).uri.toString()
139
+ : (resource as URI).toString(),
140
+ )
141
+ .toString();
132
142
  }
133
- return this.root!.getTreeNodeByPath(path);
143
+ return this.root?.getTreeNodeByPath(path);
134
144
  } else {
135
145
  if (!group) {
136
146
  return;
137
147
  }
138
- const path = this.root!.joinPath(EditorFileGroup.makeName(group.index));
139
- return this.root!.getTreeNodeByPath(path);
148
+ const groupName = formatLocalize('opened.editors.group.title', group.index + 1);
149
+ path = new Path(path).join(groupName).toString();
150
+ return this.root?.getTreeNodeByPath(path);
140
151
  }
141
152
  }
142
153