@opensumi/ide-core-browser 2.25.4 → 2.26.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 (52) hide show
  1. package/lib/common/common.command.d.ts +5 -0
  2. package/lib/common/common.command.d.ts.map +1 -1
  3. package/lib/common/common.command.js +17 -1
  4. package/lib/common/common.command.js.map +1 -1
  5. package/lib/components/actions/index.d.ts +2 -0
  6. package/lib/components/actions/index.d.ts.map +1 -1
  7. package/lib/components/actions/index.js +11 -11
  8. package/lib/components/actions/index.js.map +1 -1
  9. package/lib/components/actions/styles.module.less +1 -1
  10. package/lib/components/layout/layout.d.ts +5 -5
  11. package/lib/components/layout/split-panel.d.ts.map +1 -1
  12. package/lib/components/layout/split-panel.js +40 -39
  13. package/lib/components/layout/split-panel.js.map +1 -1
  14. package/lib/components/resize/resize.module.less +5 -2
  15. package/lib/core-preferences.d.ts +1 -0
  16. package/lib/core-preferences.d.ts.map +1 -1
  17. package/lib/core-preferences.js +5 -0
  18. package/lib/core-preferences.js.map +1 -1
  19. package/lib/layout/layout.interface.d.ts +2 -0
  20. package/lib/layout/layout.interface.d.ts.map +1 -1
  21. package/lib/layout/layout.interface.js.map +1 -1
  22. package/lib/markdown/index.d.ts.map +1 -1
  23. package/lib/markdown/index.js +0 -1
  24. package/lib/markdown/index.js.map +1 -1
  25. package/lib/menu/next/menu-id.d.ts +2 -1
  26. package/lib/menu/next/menu-id.d.ts.map +1 -1
  27. package/lib/menu/next/menu-id.js +2 -0
  28. package/lib/menu/next/menu-id.js.map +1 -1
  29. package/lib/preferences/settings.d.ts +4 -0
  30. package/lib/preferences/settings.d.ts.map +1 -1
  31. package/lib/react-providers/config-provider.d.ts +3 -2
  32. package/lib/react-providers/config-provider.d.ts.map +1 -1
  33. package/lib/style/entry.less +1 -1
  34. package/lib/style/icon.less +3 -3
  35. package/lib/style/override.less +1 -1
  36. package/lib/style/toolbar.less +1 -1
  37. package/package.json +5 -5
  38. package/src/common/common.command.ts +17 -0
  39. package/src/components/actions/index.tsx +31 -11
  40. package/src/components/actions/styles.module.less +1 -1
  41. package/src/components/layout/split-panel.tsx +204 -168
  42. package/src/components/resize/resize.module.less +5 -2
  43. package/src/core-preferences.ts +6 -0
  44. package/src/layout/layout.interface.ts +2 -0
  45. package/src/markdown/index.tsx +0 -1
  46. package/src/menu/next/menu-id.ts +2 -0
  47. package/src/preferences/settings.ts +4 -0
  48. package/src/react-providers/config-provider.tsx +4 -2
  49. package/src/style/entry.less +1 -1
  50. package/src/style/icon.less +3 -3
  51. package/src/style/override.less +1 -1
  52. package/src/style/toolbar.less +1 -1
@@ -37,6 +37,7 @@ export interface CoreConfiguration {
37
37
  'explorer.compactFolders': boolean;
38
38
  'debug.toolbar.float': boolean;
39
39
  'debug.breakpoint.editorHint': boolean;
40
+ 'debug.breakpoint.showBreakpointsInOverviewRuler': boolean;
40
41
  'debug.toolbar.top': number;
41
42
  'debug.toolbar.height': number;
42
43
  'files.watcherExclude': {
@@ -1 +1 @@
1
- {"version":3,"file":"core-preferences.d.ts","sourceRoot":"","sources":["../src/core-preferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAKL,gBAAgB,EAEjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAyB,eAAe,EAAqB,MAAM,eAAe,CAAC;AAO1F,eAAO,MAAM,cAAc;;;;;;;;;;;;;;CAc1B,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;CAG9B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,gBA0PlC,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,yBAAyB,EAAE,OAAO,GAAG,YAAY,GAAG,QAAQ,CAAC;IAC7D,kCAAkC,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC5D,yBAAyB,EAAE,aAAa,GAAG,aAAa,CAAC;IACzD,2BAA2B,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClD,kCAAkC,EAAE,MAAM,CAAC;IAC3C,kDAAkD,EAAE,MAAM,CAAC;IAC3D,mCAAmC,EAAE,OAAO,CAAC;IAC7C,wBAAwB,EAAE,OAAO,CAAC;IAClC,8BAA8B,EAAE,MAAM,CAAC;IACvC,0BAA0B,EAAE,MAAM,CAAC;IACnC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,yBAAyB,EAAE,OAAO,CAAC;IACnC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,6BAA6B,EAAE,OAAO,CAAC;IACvC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACnD,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC5C,oBAAoB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,QAQrD"}
1
+ {"version":3,"file":"core-preferences.d.ts","sourceRoot":"","sources":["../src/core-preferences.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAKL,gBAAgB,EAEjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAyB,eAAe,EAAqB,MAAM,eAAe,CAAC;AAO1F,eAAO,MAAM,cAAc;;;;;;;;;;;;;;CAc1B,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;CAG9B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,gBA+PlC,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,yBAAyB,EAAE,OAAO,GAAG,YAAY,GAAG,QAAQ,CAAC;IAC7D,kCAAkC,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC5D,yBAAyB,EAAE,aAAa,GAAG,aAAa,CAAC;IACzD,2BAA2B,EAAE,QAAQ,GAAG,SAAS,CAAC;IAClD,kCAAkC,EAAE,MAAM,CAAC;IAC3C,kDAAkD,EAAE,MAAM,CAAC;IAC3D,mCAAmC,EAAE,OAAO,CAAC;IAC7C,wBAAwB,EAAE,OAAO,CAAC;IAClC,8BAA8B,EAAE,MAAM,CAAC;IACvC,0BAA0B,EAAE,MAAM,CAAC;IACnC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,yBAAyB,EAAE,OAAO,CAAC;IACnC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,6BAA6B,EAAE,OAAO,CAAC;IACvC,iDAAiD,EAAE,OAAO,CAAC;IAC3D,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACnD,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC5C,oBAAoB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC,iBAAiB,CAAC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,QAAQ,QAQrD"}
@@ -147,6 +147,11 @@ exports.corePreferenceSchema = {
147
147
  default: true,
148
148
  description: '%preference.debug.breakpoint.editorHint%',
149
149
  },
150
+ 'debug.breakpoint.showBreakpointsInOverviewRuler': {
151
+ type: 'boolean',
152
+ default: false,
153
+ description: '%preference.debug.breakpoint.showBreakpointsInOverviewRuler%',
154
+ },
150
155
  'debug.toolbar.top': {
151
156
  type: 'number',
152
157
  default: 0,
@@ -1 +1 @@
1
- {"version":3,"file":"core-preferences.js","sourceRoot":"","sources":["../src/core-preferences.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"core-preferences.js","sourceRoot":"","sources":["../src/core-preferences.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import type React from 'react';
2
2
  import { MaybeNull, BasicEvent } from '@opensumi/ide-core-common';
3
+ import { Layout } from '../components/layout/index';
3
4
  import type { IMenu, IContextMenu } from '../menu/next';
4
5
  import type { SlotLocation } from '../react-providers';
5
6
  export type Side = 'left' | 'right' | 'bottom';
@@ -56,6 +57,7 @@ export interface ExtViewContainerOptions {
56
57
  noResize?: boolean;
57
58
  fromExtension?: boolean;
58
59
  miniSize?: number;
60
+ alignment?: Layout.alignment;
59
61
  }
60
62
  export declare const ComponentRegistry: unique symbol;
61
63
  export interface ComponentRegistry {
@@ -1 +1 @@
1
- {"version":3,"file":"layout.interface.d.ts","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"layout.interface.d.ts","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"layout.interface.js","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":";;;AAEA,+DAAkE;AA4ErD,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAa7D,MAAa,aAAa;IACxB;;;OAGG;IACH,YAAmB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;CAClD;AAND,sCAMC;AACD,MAAa,WAAY,SAAQ,4BAAyB;CAAG;AAA7D,kCAA6D;AAE7D,MAAa,aAAc,SAAQ,4BAAgB;CAAG;AAAtD,sCAAsD"}
1
+ {"version":3,"file":"layout.interface.js","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":";;;AAEA,+DAAkE;AA8ErD,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAa7D,MAAa,aAAa;IACxB;;;OAGG;IACH,YAAmB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;CAClD;AAND,sCAMC;AACD,MAAa,WAAY,SAAQ,4BAAyB;CAAG;AAA7D,kCAA6D;AAE7D,MAAa,aAAc,SAAQ,4BAAgB;CAAG;AAAtD,sCAAsD"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markdown/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAO,MAAM,UAAU,YAAa,MAAM,GAAG,MAAM,SAAS,WAAW,cAAc,KAAG,MAAM,SAK3F,CAAC;AAEJ,eAAO,MAAM,cAAc,YAAa,MAAM,KAAG,MAehD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markdown/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,eAAO,MAAM,UAAU,YAAa,MAAM,GAAG,MAAM,SAAS,WAAW,cAAc,KAAG,MAAM,SAK3F,CAAC;AAEJ,eAAO,MAAM,cAAc,YAAa,MAAM,KAAG,MAchD,CAAC"}
@@ -14,7 +14,6 @@ const toMarkdownHtml = (message) => {
14
14
  gfm: true,
15
15
  breaks: false,
16
16
  pedantic: false,
17
- sanitize: true,
18
17
  smartLists: true,
19
18
  smartypants: false,
20
19
  renderer,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/markdown/index.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAE1B,yEAA+F;AAC/F,8DAAoG;AAI7F,MAAM,UAAU,GAAG,CAAC,OAAiC,EAAE,MAAuB,EAAmB,EAAE,CACxG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC5B,8BAAC,sBAAa,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,OAAO,CAAC,GAAkB,CAC/E,CAAC,CAAC,CAAC,CACF,OAAO,CACR,CAAC;AALS,QAAA,UAAU,cAKnB;AAEG,MAAM,cAAc,GAAG,CAAC,OAAe,EAAU,EAAE;IACxD,MAAM,QAAQ,GAAG,IAAA,4BAAoB,GAAE,CAAC;IAExC,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CACpC,qBAAqB,yBAAgB,KAAK,IAAI,sCAAsC,KAAK,KAAK,IAAI,MAAM,CAAC;IAE3G,OAAO,IAAA,sBAAM,EAAC,OAAO,EAAE;QACrB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,KAAK;QAClB,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,cAAc,kBAezB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/markdown/index.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAE1B,yEAA+F;AAC/F,8DAAoG;AAI7F,MAAM,UAAU,GAAG,CAAC,OAAiC,EAAE,MAAuB,EAAmB,EAAE,CACxG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC5B,8BAAC,sBAAa,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,OAAO,CAAC,GAAkB,CAC/E,CAAC,CAAC,CAAC,CACF,OAAO,CACR,CAAC;AALS,QAAA,UAAU,cAKnB;AAEG,MAAM,cAAc,GAAG,CAAC,OAAe,EAAU,EAAE;IACxD,MAAM,QAAQ,GAAG,IAAA,4BAAoB,GAAE,CAAC;IAExC,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CACpC,qBAAqB,yBAAgB,KAAK,IAAI,sCAAsC,KAAK,KAAK,IAAI,MAAM,CAAC;IAE3G,OAAO,IAAA,sBAAM,EAAC,OAAO,EAAE;QACrB,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,KAAK;QAClB,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,cAAc,kBAczB"}
@@ -71,7 +71,8 @@ export declare enum MenuId {
71
71
  OpenTypeSubmenuContext = "editor/openType/submenu",
72
72
  AccordionContext = "accordion",
73
73
  SettingJSONGlyphMarginContext = "settingJson/glyphMargin/context",
74
- SubSettingJSONGlyphMarginContext = "sub/settingJson/glyphMargin/context"
74
+ SubSettingJSONGlyphMarginContext = "sub/settingJson/glyphMargin/context",
75
+ MergeEditorResultTitleContext = "mergeEditor/result/title/context"
75
76
  }
76
77
  export declare function getTabbarCommonMenuId(location: string): string;
77
78
  //# sourceMappingURL=menu-id.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"menu-id.d.ts","sourceRoot":"","sources":["../../../src/menu/next/menu-id.ts"],"names":[],"mappings":"AACA,oBAAY,MAAM;IAChB,eAAe,qBAAqB;IACpC,kBAAkB,wBAAwB;IAC1C,gBAAgB,sBAAsB;IACtC,mBAAmB,0BAA0B;IAC7C,cAAc,mBAAmB;IACjC,uBAAuB,8BAA8B;IACrD,qBAAqB,4BAA4B;IACjD,mBAAmB,0BAA0B;IAC7C,qBAAqB,4BAA4B;IACjD,iBAAiB,wBAAwB;IACzC,YAAY,kBAAkB;IAC9B,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;IAC5B,cAAc,qBAAqB;IACnC,kBAAkB,yBAAyB;IAC3C,uBAAuB,8BAA8B;IACrD,uBAAuB,+BAA+B;IACtD,eAAe,qBAAqB;IAEpC,kBAAkB,wBAAwB;IAC1C,qBAAqB,uBAAuB;IAC5C,cAAc,gBAAgB;IAC9B,gBAAgB,kBAAkB;IAClC,eAAe,iBAAiB;IAChC,eAAe,sBAAsB;IACrC,aAAa,eAAe;IAC5B,eAAe,iBAAiB;IAChC,iBAAiB,mBAAmB;IACpC,wBAAwB,2BAA2B;IACnD,sBAAsB,wBAAwB;IAC9C,iBAAiB,mBAAmB;IACpC,oBAAoB,sBAAsB;IAC1C,uBAAuB,0BAA0B;IACjD,sBAAsB,yBAAyB;IAC/C,mBAAmB,qBAAqB;IACxC,eAAe,iBAAiB;IAChC,kBAAkB,yBAAyB;IAC3C,uBAAuB,8BAA8B;IACrD,0BAA0B,iCAAiC;IAC3D,kBAAkB,yBAAyB;IAC3C,oBAAoB,2BAA2B;IAC/C,uBAAuB,0BAA0B;IACjD,kBAAkB,yBAAyB;IAC3C,oBAAoB,2BAA2B;IAC/C,cAAc,qBAAqB;IACnC,kBAAkB,8BAA8B;IAChD,uBAAuB,8BAA8B;IACrD,wBAAwB,+BAA+B;IACvD,gBAAgB,sBAAsB;IACtC,QAAQ,cAAc;IACtB,QAAQ,cAAc;IACtB,aAAa,mBAAmB;IAChC,gBAAgB,sBAAsB;IACtC,4BAA4B,8BAA8B;IAC1D,eAAe,qBAAqB;IACpC,eAAe,sBAAsB;IACrC,SAAS,eAAe;IACxB,cAAc,oBAAoB;IAClC,gBAAgB,sBAAsB;IACtC,gBAAgB,uBAAuB;IAEvC,4BAA4B,mCAAmC;IAE/D,0BAA0B,iCAAiC;IAE3D,oBAAoB,2BAA2B;IAE/C,sBAAsB,6BAA6B;IACnD,2BAA2B,mCAAmC;IAC9D,8BAA8B,sCAAsC;IAEpE,wBAAwB,uBAAuB;IAE/C,2BAA2B,kCAAkC;IAE7D,yBAAyB,gCAAgC;IACzD,oBAAoB,qCAAqC;IAEzD,sBAAsB,4BAA4B;IAElD,gBAAgB,cAAc;IAE9B,6BAA6B,oCAAoC;IACjE,gCAAgC,wCAAwC;CACzE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,UAErD"}
1
+ {"version":3,"file":"menu-id.d.ts","sourceRoot":"","sources":["../../../src/menu/next/menu-id.ts"],"names":[],"mappings":"AACA,oBAAY,MAAM;IAChB,eAAe,qBAAqB;IACpC,kBAAkB,wBAAwB;IAC1C,gBAAgB,sBAAsB;IACtC,mBAAmB,0BAA0B;IAC7C,cAAc,mBAAmB;IACjC,uBAAuB,8BAA8B;IACrD,qBAAqB,4BAA4B;IACjD,mBAAmB,0BAA0B;IAC7C,qBAAqB,4BAA4B;IACjD,iBAAiB,wBAAwB;IACzC,YAAY,kBAAkB;IAC9B,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;IAC5B,cAAc,qBAAqB;IACnC,kBAAkB,yBAAyB;IAC3C,uBAAuB,8BAA8B;IACrD,uBAAuB,+BAA+B;IACtD,eAAe,qBAAqB;IAEpC,kBAAkB,wBAAwB;IAC1C,qBAAqB,uBAAuB;IAC5C,cAAc,gBAAgB;IAC9B,gBAAgB,kBAAkB;IAClC,eAAe,iBAAiB;IAChC,eAAe,sBAAsB;IACrC,aAAa,eAAe;IAC5B,eAAe,iBAAiB;IAChC,iBAAiB,mBAAmB;IACpC,wBAAwB,2BAA2B;IACnD,sBAAsB,wBAAwB;IAC9C,iBAAiB,mBAAmB;IACpC,oBAAoB,sBAAsB;IAC1C,uBAAuB,0BAA0B;IACjD,sBAAsB,yBAAyB;IAC/C,mBAAmB,qBAAqB;IACxC,eAAe,iBAAiB;IAChC,kBAAkB,yBAAyB;IAC3C,uBAAuB,8BAA8B;IACrD,0BAA0B,iCAAiC;IAC3D,kBAAkB,yBAAyB;IAC3C,oBAAoB,2BAA2B;IAC/C,uBAAuB,0BAA0B;IACjD,kBAAkB,yBAAyB;IAC3C,oBAAoB,2BAA2B;IAC/C,cAAc,qBAAqB;IACnC,kBAAkB,8BAA8B;IAChD,uBAAuB,8BAA8B;IACrD,wBAAwB,+BAA+B;IACvD,gBAAgB,sBAAsB;IACtC,QAAQ,cAAc;IACtB,QAAQ,cAAc;IACtB,aAAa,mBAAmB;IAChC,gBAAgB,sBAAsB;IACtC,4BAA4B,8BAA8B;IAC1D,eAAe,qBAAqB;IACpC,eAAe,sBAAsB;IACrC,SAAS,eAAe;IACxB,cAAc,oBAAoB;IAClC,gBAAgB,sBAAsB;IACtC,gBAAgB,uBAAuB;IAEvC,4BAA4B,mCAAmC;IAE/D,0BAA0B,iCAAiC;IAE3D,oBAAoB,2BAA2B;IAE/C,sBAAsB,6BAA6B;IACnD,2BAA2B,mCAAmC;IAC9D,8BAA8B,sCAAsC;IAEpE,wBAAwB,uBAAuB;IAE/C,2BAA2B,kCAAkC;IAE7D,yBAAyB,gCAAgC;IACzD,oBAAoB,qCAAqC;IAEzD,sBAAsB,4BAA4B;IAElD,gBAAgB,cAAc;IAE9B,6BAA6B,oCAAoC;IACjE,gCAAgC,wCAAwC;IAExE,6BAA6B,qCAAqC;CACnE;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,UAErD"}
@@ -88,6 +88,8 @@ var MenuId;
88
88
  // setting.json
89
89
  MenuId["SettingJSONGlyphMarginContext"] = "settingJson/glyphMargin/context";
90
90
  MenuId["SubSettingJSONGlyphMarginContext"] = "sub/settingJson/glyphMargin/context";
91
+ // merge editor context
92
+ MenuId["MergeEditorResultTitleContext"] = "mergeEditor/result/title/context";
91
93
  })(MenuId = exports.MenuId || (exports.MenuId = {}));
92
94
  function getTabbarCommonMenuId(location) {
93
95
  return `tabbar/${location}/common`;
@@ -1 +1 @@
1
- {"version":3,"file":"menu-id.js","sourceRoot":"","sources":["../../../src/menu/next/menu-id.ts"],"names":[],"mappings":";;;AAAA,gBAAgB;AAChB,IAAY,MAqFX;AArFD,WAAY,MAAM;IAChB,8CAAoC,CAAA;IACpC,oDAA0C,CAAA;IAC1C,gDAAsC,CAAA;IACtC,uDAA6C,CAAA;IAC7C,2CAAiC,CAAA;IACjC,+DAAqD,CAAA;IACrD,2DAAiD,CAAA;IACjD,uDAA6C,CAAA;IAC7C,2DAAiD,CAAA;IACjD,mDAAyC,CAAA;IACzC,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,sCAA4B,CAAA;IAC5B,6CAAmC,CAAA;IACnC,qDAA2C,CAAA;IAC3C,+DAAqD,CAAA;IACrD,gEAAsD,CAAA;IACtD,8CAAoC,CAAA;IACpC,mBAAmB;IACnB,oDAA0C,CAAA;IAC1C,sDAA4C,CAAA;IAC5C,wCAA8B,CAAA;IAC9B,4CAAkC,CAAA;IAClC,0CAAgC,CAAA;IAChC,+CAAqC,CAAA;IACrC,sCAA4B,CAAA;IAC5B,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,6DAAmD,CAAA;IACnD,wDAA8C,CAAA;IAC9C,8CAAoC,CAAA;IACpC,oDAA0C,CAAA;IAC1C,2DAAiD,CAAA;IACjD,yDAA+C,CAAA;IAC/C,kDAAwC,CAAA;IACxC,0CAAgC,CAAA;IAChC,qDAA2C,CAAA;IAC3C,+DAAqD,CAAA;IACrD,qEAA2D,CAAA;IAC3D,qDAA2C,CAAA;IAC3C,yDAA+C,CAAA;IAC/C,2DAAiD,CAAA;IACjD,qDAA2C,CAAA;IAC3C,yDAA+C,CAAA;IAC/C,6CAAmC,CAAA;IACnC,0DAAgD,CAAA;IAChD,+DAAqD,CAAA;IACrD,iEAAuD,CAAA;IACvD,gDAAsC,CAAA;IACtC,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,0CAAgC,CAAA;IAChC,gDAAsC,CAAA;IACtC,oEAA0D,CAAA;IAC1D,8CAAoC,CAAA,CAAC,UAAU;IAC/C,+CAAqC,CAAA;IACrC,kCAAwB,CAAA;IACxB,4CAAkC,CAAA;IAClC,gDAAsC,CAAA;IACtC,iDAAuC,CAAA;IACvC,4FAA4F;IAC5F,yEAA+D,CAAA;IAC/D,4CAA4C;IAC5C,qEAA2D,CAAA;IAC3D,qCAAqC;IACrC,yDAA+C,CAAA;IAC/C,qFAAqF;IACrF,6DAAmD,CAAA;IACnD,wEAA8D,CAAA;IAC9D,8EAAoE,CAAA;IACpE,kBAAkB;IAClB,yDAA+C,CAAA;IAC/C,aAAa;IACb,uEAA6D,CAAA;IAC7D,uBAAuB;IACvB,mEAAyD,CAAA;IACzD,mEAAyD,CAAA;IACzD,WAAW;IACX,4DAAkD,CAAA;IAClD,YAAY;IACZ,wCAA8B,CAAA;IAC9B,eAAe;IACf,2EAAiE,CAAA;IACjE,kFAAwE,CAAA;AAC1E,CAAC,EArFW,MAAM,GAAN,cAAM,KAAN,cAAM,QAqFjB;AAED,SAAgB,qBAAqB,CAAC,QAAgB;IACpD,OAAO,UAAU,QAAQ,SAAS,CAAC;AACrC,CAAC;AAFD,sDAEC"}
1
+ {"version":3,"file":"menu-id.js","sourceRoot":"","sources":["../../../src/menu/next/menu-id.ts"],"names":[],"mappings":";;;AAAA,gBAAgB;AAChB,IAAY,MAuFX;AAvFD,WAAY,MAAM;IAChB,8CAAoC,CAAA;IACpC,oDAA0C,CAAA;IAC1C,gDAAsC,CAAA;IACtC,uDAA6C,CAAA;IAC7C,2CAAiC,CAAA;IACjC,+DAAqD,CAAA;IACrD,2DAAiD,CAAA;IACjD,uDAA6C,CAAA;IAC7C,2DAAiD,CAAA;IACjD,mDAAyC,CAAA;IACzC,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,sCAA4B,CAAA;IAC5B,6CAAmC,CAAA;IACnC,qDAA2C,CAAA;IAC3C,+DAAqD,CAAA;IACrD,gEAAsD,CAAA;IACtD,8CAAoC,CAAA;IACpC,mBAAmB;IACnB,oDAA0C,CAAA;IAC1C,sDAA4C,CAAA;IAC5C,wCAA8B,CAAA;IAC9B,4CAAkC,CAAA;IAClC,0CAAgC,CAAA;IAChC,+CAAqC,CAAA;IACrC,sCAA4B,CAAA;IAC5B,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,6DAAmD,CAAA;IACnD,wDAA8C,CAAA;IAC9C,8CAAoC,CAAA;IACpC,oDAA0C,CAAA;IAC1C,2DAAiD,CAAA;IACjD,yDAA+C,CAAA;IAC/C,kDAAwC,CAAA;IACxC,0CAAgC,CAAA;IAChC,qDAA2C,CAAA;IAC3C,+DAAqD,CAAA;IACrD,qEAA2D,CAAA;IAC3D,qDAA2C,CAAA;IAC3C,yDAA+C,CAAA;IAC/C,2DAAiD,CAAA;IACjD,qDAA2C,CAAA;IAC3C,yDAA+C,CAAA;IAC/C,6CAAmC,CAAA;IACnC,0DAAgD,CAAA;IAChD,+DAAqD,CAAA;IACrD,iEAAuD,CAAA;IACvD,gDAAsC,CAAA;IACtC,gCAAsB,CAAA;IACtB,gCAAsB,CAAA;IACtB,0CAAgC,CAAA;IAChC,gDAAsC,CAAA;IACtC,oEAA0D,CAAA;IAC1D,8CAAoC,CAAA,CAAC,UAAU;IAC/C,+CAAqC,CAAA;IACrC,kCAAwB,CAAA;IACxB,4CAAkC,CAAA;IAClC,gDAAsC,CAAA;IACtC,iDAAuC,CAAA;IACvC,4FAA4F;IAC5F,yEAA+D,CAAA;IAC/D,4CAA4C;IAC5C,qEAA2D,CAAA;IAC3D,qCAAqC;IACrC,yDAA+C,CAAA;IAC/C,qFAAqF;IACrF,6DAAmD,CAAA;IACnD,wEAA8D,CAAA;IAC9D,8EAAoE,CAAA;IACpE,kBAAkB;IAClB,yDAA+C,CAAA;IAC/C,aAAa;IACb,uEAA6D,CAAA;IAC7D,uBAAuB;IACvB,mEAAyD,CAAA;IACzD,mEAAyD,CAAA;IACzD,WAAW;IACX,4DAAkD,CAAA;IAClD,YAAY;IACZ,wCAA8B,CAAA;IAC9B,eAAe;IACf,2EAAiE,CAAA;IACjE,kFAAwE,CAAA;IACxE,uBAAuB;IACvB,4EAAkE,CAAA;AACpE,CAAC,EAvFW,MAAM,GAAN,cAAM,KAAN,cAAM,QAuFjB;AAED,SAAgB,qBAAqB,CAAC,QAAgB;IACpD,OAAO,UAAU,QAAQ,SAAS,CAAC;AACrC,CAAC;AAFD,sDAEC"}
@@ -42,6 +42,10 @@ export interface IPreferenceViewDesc {
42
42
  hiddenInScope?: PreferenceScope[];
43
43
  }
44
44
  export interface ISettingSection {
45
+ /**
46
+ * 插件 ID
47
+ */
48
+ extensionId?: string;
45
49
  /**
46
50
  * 该 Section 的名字
47
51
  */
@@ -1 +1 @@
1
- {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/preferences/settings.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IAEpC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,OAAE;IAE/D,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IAE3E,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IAExD,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,WAAW,CAAC;IAE/E,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAAC;IACzG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAC;IAC7E,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,eAAe,CAAA;KAAE,CAAC;IAE/G,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAE/E,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAE5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAAE,KAAK,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5D;;OAEG;IACH,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,WAAW,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,uBAAuB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
1
+ {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/preferences/settings.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,wBAAwB,EAAE,CAAC;IAEpC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,OAAE;IAE/D,gBAAgB,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IAE3E,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IAExD,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,WAAW,CAAC;IAE/E,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,uBAAuB,EAAE,CAAC;IACzG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAAC;IAC7E,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,GAAG,CAAC;QAAC,cAAc,EAAE,eAAe,CAAA;KAAE,CAAC;IAE/G,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAE/E,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa;IAE5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAAE,KAAK,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5D;;OAEG;IACH,WAAW,CAAC,EAAE,eAAe,EAAE,CAAC;IAChC;;OAEG;IACH,aAAa,CAAC,EAAE,eAAe,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,WAAW,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,uBAAuB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
@@ -155,7 +155,7 @@ export interface AppConfig {
155
155
  /**
156
156
  * @ClientOption
157
157
  * 额外的 ConfigProvider
158
- * 可以让 IDE-framework 内部的 ReactDOM.render 调用时
158
+ * 可以让 OpenSumi 内部的 ReactDOM.render 调用时
159
159
  * 都被其包裹一层,以达到额外的 context 传递效果
160
160
  */
161
161
  extraContextProvider?: React.ComponentType<React.PropsWithChildren<any>>;
@@ -211,7 +211,7 @@ export interface AppConfig {
211
211
  * 视图组件内默认的组件样式资源 CDN 来源
212
212
  * 默认值为 'alipay'
213
213
  */
214
- componentCDNType?: 'unpkg' | 'jsdelivr' | 'alipay';
214
+ componentCDNType?: TComponentCDNType;
215
215
  /**
216
216
  * 指定前端是否为 Electron 环境 (Electron Renderer)
217
217
  * 为兼容老的逻辑,若不兼容则 fallback 到 isElectronRenderer 的判断
@@ -248,4 +248,5 @@ export declare const ConfigContext: React.Context<AppConfig>;
248
248
  export declare function ConfigProvider(props: React.PropsWithChildren<{
249
249
  value: AppConfig;
250
250
  }>): JSX.Element;
251
+ export type TComponentCDNType = 'unpkg' | 'jsdelivr' | 'alipay' | 'npmmirror';
251
252
  //# sourceMappingURL=config-provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config-provider.d.ts","sourceRoot":"","sources":["../../src/react-providers/config-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EACV,0BAA0B,EAC1B,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACZ,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE/D,eAAO,MAAM,SAAS,eAAsB,CAAC;AAC7C,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC;IAClC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IACnB;;OAEG;IACH,MAAM,EAAE,WAAW,CAAC;IACpB;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAC3B;;;OAGG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;IAC3B;;;OAGG;IACH,UAAU,CAAC,EAAE;QAAE,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAChD;;;;OAIG;IACH,aAAa,CAAC,EAAE;QAAE,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnD;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC1C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE;;;;OAIG;IACH,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,yBAAyB,CAAC,EAAE,kBAAkB,CAAC;IAC/C;;OAEG;IACH,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAChD;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,CAAC;IACnD;;;;OAIG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,0BAA0B,CAAC,EAAE,0BAA0B,CAAC;IACxD;;;OAGG;IACH,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAK1C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,0BAOxB,CAAC;AAEH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC,eAalF"}
1
+ {"version":3,"file":"config-provider.d.ts","sourceRoot":"","sources":["../../src/react-providers/config-provider.tsx"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@
5
5
  * 请不要在这个文件直接添加样式内容
6
6
  */
7
7
 
8
- @import '~@opensumi/ide-components/lib/style/base.less';
8
+ @import '@opensumi/ide-components/lib/style/base.less';
9
9
  @import './variable.less';
10
10
 
11
11
  @import './icon/index.less';
@@ -1,7 +1,7 @@
1
- // 本地IDE集成时引入该文件: @opensumi/ide-core-browser/lib/style/icon.less
2
- @import '~@opensumi/ide-components/lib/icon/iconfont/iconfont.css';
1
+ // 本地 IDE 集成时需引入该文件: @opensumi/ide-core-browser/lib/style/icon.less
2
+ @import '@opensumi/ide-components/lib/icon/iconfont/iconfont.css';
3
3
  @import './octicons/octicons.css';
4
- @import '~@vscode/codicons/dist/codicon.css';
4
+ @import '@vscode/codicons/dist/codicon.css';
5
5
 
6
6
  .kaitian-icon {
7
7
  font-size: 14px;
@@ -1,4 +1,4 @@
1
- @import '~@opensumi/ide-components/lib/style/mixins.less';
1
+ @import '@opensumi/ide-components/lib/style/mixins.less';
2
2
  @import './variable.less';
3
3
 
4
4
  .codicon[class*='codicon-'] {
@@ -1,4 +1,4 @@
1
- @import '~@opensumi/ide-components/lib/style/mixins.less';
1
+ @import '@opensumi/ide-components/lib/style/mixins.less';
2
2
 
3
3
  .kt-toolbar-location {
4
4
  position: relative;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-core-browser",
3
- "version": "2.25.4",
3
+ "version": "2.26.0",
4
4
  "description": "@opensumi/ide-core-browser",
5
5
  "files": [
6
6
  "lib",
@@ -18,9 +18,9 @@
18
18
  "build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
19
19
  },
20
20
  "dependencies": {
21
- "@opensumi/ide-components": "2.25.4",
22
- "@opensumi/ide-connection": "2.25.4",
23
- "@opensumi/ide-core-common": "2.25.4",
21
+ "@opensumi/ide-components": "2.26.0",
22
+ "@opensumi/ide-connection": "2.26.0",
23
+ "@opensumi/ide-core-common": "2.26.0",
24
24
  "@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
25
25
  "@vscode/codicons": "0.0.27",
26
26
  "ajv": "^6.10.0",
@@ -50,5 +50,5 @@
50
50
  "peerDependencies": {
51
51
  "react": ">=16.8.6"
52
52
  },
53
- "gitHead": "4aa3691d8d761f2fe8054c38e45797bc5aa3d230"
53
+ "gitHead": "ac1e2c7dbb8e57442142633aee587c454d5925c3"
54
54
  }
@@ -363,6 +363,12 @@ export namespace EDITOR_COMMANDS {
363
363
  category: CATEGORY,
364
364
  };
365
365
 
366
+ export const MERGEEDITOR_RESET: Command = {
367
+ id: 'editor.mergeEditor.reset',
368
+ category: CATEGORY,
369
+ label: '%mergeEditor.reset%',
370
+ };
371
+
366
372
  export const CLOSE: Command = {
367
373
  id: 'editor.close',
368
374
  category: CATEGORY,
@@ -1012,3 +1018,14 @@ export namespace QUICK_OPEN_COMMANDS {
1012
1018
  id: 'editor.action.quickView',
1013
1019
  };
1014
1020
  }
1021
+
1022
+ export namespace SCM_COMMANDS {
1023
+ // git extension 1.71 版本之前存在下划线,这里为了做兼容处理: https://github.com/microsoft/vscode/blob/1.68.1/extensions/git/src/repository.ts#L613
1024
+ export const _GIT_OPEN_MERGE_EDITOR: Command = {
1025
+ id: '_git.openMergeEditor',
1026
+ };
1027
+ // git extension 1.71 版本之后就去掉了前面的下划线: https://github.com/microsoft/vscode/commit/c0ade8bc816386b7194d69fed878d4b9bb796d6c#diff-da56ff967ab1a9606c01af61dc926332afb862f13c8e5c74a575bc2aa1b15e43R411
1028
+ export const GIT_OPEN_MERGE_EDITOR: Command = {
1029
+ id: 'git.openMergeEditor',
1030
+ };
1031
+ }
@@ -108,9 +108,9 @@ export const MenuActionList: React.FC<{
108
108
  }
109
109
 
110
110
  return (
111
- <>
111
+ <React.Fragment key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}>
112
112
  <Menu.SubMenu
113
- key={`${(menuNode as SubmenuItemNode).submenuId}-${index}`}
113
+ key={`${menuNode.id}-${(menuNode as SubmenuItemNode).submenuId}-${index}`}
114
114
  className={styles.submenuItem}
115
115
  popupClassName='kt-menu'
116
116
  title={<MenuAction hasSubmenu data={menuNode} iconService={iconService} />}
@@ -118,22 +118,22 @@ export const MenuActionList: React.FC<{
118
118
  {recursiveRender(menuNode.children, menuNode.label)}
119
119
  </Menu.SubMenu>
120
120
  {hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
121
- </>
121
+ </React.Fragment>
122
122
  );
123
123
  }
124
124
 
125
125
  return (
126
- <>
126
+ <React.Fragment key={`${menuNode.id}-${index}`}>
127
127
  <Menu.Item
128
128
  id={`${menuNode.id}-${index}`}
129
- key={`${menuNode.id}-${key}-${index}`}
129
+ key={`${menuNode.id}-${index}`}
130
130
  className={styles.menuItem}
131
131
  disabled={menuNode.disabled}
132
132
  >
133
133
  <MenuAction data={menuNode} disabled={menuNode.disabled} iconService={iconService} />
134
134
  </Menu.Item>
135
135
  {hasSeparator ? <Menu.Divider key={`divider-${index}`} className={styles.menuItemDivider} /> : null}
136
- </>
136
+ </React.Fragment>
137
137
  );
138
138
  }),
139
139
  [],
@@ -158,9 +158,19 @@ const EllipsisWidget: React.FC<{
158
158
  icon?: string;
159
159
  disabled?: boolean;
160
160
  onClick?: React.MouseEventHandler<HTMLElement>;
161
- }> = ({ type, icon, disabled, onClick }) => {
161
+ title?: string;
162
+ }> = ({ type, icon, disabled, onClick, title }) => {
162
163
  if (type === 'icon') {
163
- return <Icon icon={icon || 'ellipsis'} className={styles.iconAction} onClick={onClick} />;
164
+ return (
165
+ <Button
166
+ size='small'
167
+ type={type}
168
+ className={styles.btnAction}
169
+ onClick={onClick}
170
+ title={title}
171
+ icon={icon || 'ellipsis'}
172
+ ></Button>
173
+ );
164
174
  }
165
175
  const props = {};
166
176
  if (isBoolean(disabled)) {
@@ -168,7 +178,7 @@ const EllipsisWidget: React.FC<{
168
178
  }
169
179
 
170
180
  return (
171
- <Button size='small' type='secondary' className={styles.btnAction} onClick={onClick} {...props}>
181
+ <Button size='small' type='secondary' className={styles.btnAction} onClick={onClick} {...props} title={title}>
172
182
  <Icon icon={icon || 'ellipsis'} />
173
183
  </Button>
174
184
  );
@@ -330,6 +340,7 @@ export const TitleActionList: React.FC<
330
340
  nav: MenuNode[];
331
341
  more?: MenuNode[];
332
342
  moreIcon?: string;
343
+ moreTitle?: string;
333
344
  className?: string;
334
345
  iconService?: IMenubarIconService;
335
346
  } & BaseActionListProps
@@ -343,6 +354,7 @@ export const TitleActionList: React.FC<
343
354
  nav = [],
344
355
  more = [],
345
356
  moreIcon,
357
+ moreTitle,
346
358
  context = [],
347
359
  extraNavActions = [],
348
360
  moreAtFirst = false,
@@ -378,7 +390,13 @@ export const TitleActionList: React.FC<
378
390
 
379
391
  const moreAction =
380
392
  secondary.length > 0 ? (
381
- <EllipsisWidget disabled={secondary[0].disabled} icon={moreIcon} type={type} onClick={handleShowMore} />
393
+ <EllipsisWidget
394
+ disabled={secondary[0].disabled}
395
+ icon={moreIcon}
396
+ type={type}
397
+ onClick={handleShowMore}
398
+ title={moreTitle}
399
+ />
382
400
  ) : null;
383
401
 
384
402
  return (
@@ -491,6 +509,7 @@ interface InlineMenuBarProps<T, U, K, M> extends Omit<BaseActionListProps, 'extr
491
509
  context?: TupleContext<T, U, K, M>;
492
510
  menus: IContextMenu;
493
511
  moreIcon?: string;
512
+ moreTitle?: string;
494
513
  separator?: IMenuSeparator;
495
514
  iconService?: IMenubarIconService;
496
515
  }
@@ -500,7 +519,7 @@ interface InlineMenuBarProps<T, U, K, M> extends Omit<BaseActionListProps, 'extr
500
519
  export function InlineMenuBar<T = undefined, U = undefined, K = undefined, M = undefined>(
501
520
  props: InlineMenuBarProps<T, U, K, M>,
502
521
  ): React.ReactElement<InlineMenuBarProps<T, U, K, M>> {
503
- const { iconService, menus, context, moreIcon, separator = 'navigation', ...restProps } = props;
522
+ const { iconService, menus, context, moreIcon, moreTitle, separator = 'navigation', ...restProps } = props;
504
523
  const [navMenu, moreMenu] = useContextMenus(menus);
505
524
 
506
525
  // inline 菜单不取第二组,对应内容由关联 context menu 去渲染
@@ -510,6 +529,7 @@ export function InlineMenuBar<T = undefined, U = undefined, K = undefined, M = u
510
529
  nav={navMenu}
511
530
  more={separator === 'inline' ? [] : moreMenu}
512
531
  moreIcon={moreIcon}
532
+ moreTitle={moreTitle}
513
533
  context={context}
514
534
  iconService={iconService}
515
535
  {...restProps}
@@ -1,4 +1,4 @@
1
- @import '~@opensumi/ide-core-browser/lib/style/variable.less';
1
+ @import '@opensumi/ide-core-browser/lib/style/variable.less';
2
2
  .icon,
3
3
  .submenuIcon {
4
4
  width: 12px;