@theia/core 1.53.1 → 1.54.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/README.md +6 -6
- package/i18n/nls.cs.json +3 -0
- package/i18n/nls.de.json +3 -0
- package/i18n/nls.es.json +3 -0
- package/i18n/nls.fr.json +3 -0
- package/i18n/nls.hu.json +3 -0
- package/i18n/nls.it.json +3 -0
- package/i18n/nls.ja.json +3 -0
- package/i18n/nls.json +3 -0
- package/i18n/nls.ko.json +3 -0
- package/i18n/nls.pl.json +3 -0
- package/i18n/nls.pt-br.json +3 -0
- package/i18n/nls.ru.json +3 -0
- package/i18n/nls.tr.json +3 -0
- package/i18n/nls.zh-cn.json +3 -0
- package/i18n/nls.zh-tw.json +3 -0
- package/lib/browser/authentication-service.d.ts +15 -14
- package/lib/browser/authentication-service.d.ts.map +1 -1
- package/lib/browser/authentication-service.js +5 -5
- package/lib/browser/authentication-service.js.map +1 -1
- package/lib/browser/catalog.json +136 -11
- package/lib/browser/core-preferences.d.ts.map +1 -1
- package/lib/browser/core-preferences.js +9 -0
- package/lib/browser/core-preferences.js.map +1 -1
- package/lib/browser/open-with-service.d.ts +13 -1
- package/lib/browser/open-with-service.d.ts.map +1 -1
- package/lib/browser/open-with-service.js +48 -9
- package/lib/browser/open-with-service.js.map +1 -1
- package/lib/browser/opener-service.d.ts +3 -0
- package/lib/browser/opener-service.d.ts.map +1 -1
- package/lib/browser/opener-service.js +13 -1
- package/lib/browser/opener-service.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.d.ts +3 -2
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.d.ts.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js +2 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.d.ts.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js +3 -2
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts +4 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js +2 -2
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js.map +1 -1
- package/lib/browser/widgets/extractable-widget.js +1 -1
- package/lib/browser/widgets/extractable-widget.js.map +1 -1
- package/lib/common/glob.d.ts +4 -4
- package/package.json +6 -6
- package/src/browser/authentication-service.ts +18 -19
- package/src/browser/core-preferences.ts +9 -0
- package/src/browser/open-with-service.ts +54 -7
- package/src/browser/opener-service.ts +13 -0
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts +1 -1
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts +3 -2
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts +4 -0
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx +2 -2
- package/src/browser/widgets/extractable-widget.ts +1 -1
- package/src/common/glob.ts +4 -4
|
@@ -48,6 +48,10 @@ export interface TabBarToolbarItemBase {
|
|
|
48
48
|
* If no command is present, this menu will be opened.
|
|
49
49
|
*/
|
|
50
50
|
menuPath?: MenuPath;
|
|
51
|
+
/**
|
|
52
|
+
* The path of the menu delegate that contributed this toolbar item
|
|
53
|
+
*/
|
|
54
|
+
delegateMenuPath?: MenuPath;
|
|
51
55
|
contextKeyOverlays?: Record<string, string>;
|
|
52
56
|
/**
|
|
53
57
|
* Optional ordering string for placing the item within its group
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,KAAK,EAAwB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,yEAAyE;AACzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAmC,CAAC;AAE7E,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC3C,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,IAAI,eAAe,CAEnE;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAC9D;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAE/B;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACjE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;CAC5C;AAED,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,IAAI,sBAAsB,CAE1E;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAED,yBAAiB,iBAAiB,CAAC;IAE/B;;OAEG;IACI,MAAM,mBAAmB,SAAU,iBAAiB,SAAS,iBAAiB,WAapF,CAAC;CACL"}
|
|
1
|
+
{"version":3,"file":"tab-bar-toolbar-types.d.ts","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAc,KAAK,EAAwB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,yEAAyE;AACzE,eAAO,MAAM,UAAU,eAAe,CAAC;AACvC,eAAO,MAAM,4BAA4B,UAAmC,CAAC;AAE7E,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC3C,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAAC;CAC3C;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,IAAI,eAAe,CAEnE;CACJ;AAED,MAAM,MAAM,iBAAiB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrC;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAC9D;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IAE/B;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACjE,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC;CAC5C;AAED,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,EAAE,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI,IAAI,sBAAsB,CAE1E;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvC;AAED,yBAAiB,iBAAiB,CAAC;IAE/B;;OAEG;IACI,MAAM,mBAAmB,SAAU,iBAAiB,SAAS,iBAAiB,WAapF,CAAC;CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,4CAAoF;AAGpF,yEAAyE;AAC5D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,4BAA4B,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAM7E,IAAiB,eAAe,CAI/B;AAJD,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,SAAkB;QACjC,OAAO,IAAA,iBAAQ,EAAkB,SAAS,CAAC,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAFe,kBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,eAAe,+BAAf,eAAe,QAI/B;
|
|
1
|
+
{"version":3,"file":"tab-bar-toolbar-types.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAGhF,4CAAoF;AAGpF,yEAAyE;AAC5D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,4BAA4B,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAM7E,IAAiB,eAAe,CAI/B;AAJD,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,SAAkB;QACjC,OAAO,IAAA,iBAAQ,EAAkB,SAAS,CAAC,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC3F,CAAC;IAFe,kBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,eAAe,+BAAf,eAAe,QAI/B;AAsFD,IAAiB,sBAAsB,CAItC;AAJD,WAAiB,sBAAsB;IACnC,SAAgB,EAAE,CAAC,IAAuB;QACtC,OAAO,IAAA,iBAAQ,EAAyB,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC;IACvF,CAAC;IAFe,yBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,sBAAsB,sCAAtB,sBAAsB,QAItC;AAOD,IAAiB,iBAAiB,CAmBjC;AAnBD,WAAiB,iBAAiB;IAE9B;;OAEG;IACU,qCAAmB,GAAG,CAAC,IAAuB,EAAE,KAAwB,EAAE,EAAE;;QACrF,MAAM,SAAS,GAAW,MAAA,IAAI,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACnD,MAAM,UAAU,GAAW,MAAA,KAAK,CAAC,KAAK,mCAAI,kBAAU,CAAC;QACrD,IAAI,SAAS,KAAK,kBAAU,IAAI,UAAU,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,kBAAU,IAAI,SAAS,KAAK,kBAAU,EAAE,CAAC;YACxD,OAAO,mBAAU,CAAC,IAAI,CAAC,eAAe,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC;AACN,CAAC,EAnBgB,iBAAiB,iCAAjB,iBAAiB,QAmBjC"}
|
|
@@ -354,8 +354,8 @@ let TabBarToolbar = TabBarToolbar_1 = class TabBarToolbar extends widgets_1.Reac
|
|
|
354
354
|
if (!item || !this.isEnabled(item)) {
|
|
355
355
|
return;
|
|
356
356
|
}
|
|
357
|
-
if (item.command && item.
|
|
358
|
-
this.menuCommandExecutor.executeCommand(item.
|
|
357
|
+
if (item.command && item.delegateMenuPath) {
|
|
358
|
+
this.menuCommandExecutor.executeCommand(item.delegateMenuPath, item.command, this.current);
|
|
359
359
|
}
|
|
360
360
|
else if (item.command) {
|
|
361
361
|
this.commands.executeCommand(item.command, this.current);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tab-bar-toolbar.js","sourceRoot":"","sources":["../../../../src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ const widget_1 = require("./widget");
|
|
|
20
20
|
var ExtractableWidget;
|
|
21
21
|
(function (ExtractableWidget) {
|
|
22
22
|
function is(widget) {
|
|
23
|
-
return widget instanceof widget_1.Widget &&
|
|
23
|
+
return widget instanceof widget_1.Widget && 'isExtractable' in widget && widget.isExtractable === true;
|
|
24
24
|
}
|
|
25
25
|
ExtractableWidget.is = is;
|
|
26
26
|
})(ExtractableWidget || (exports.ExtractableWidget = ExtractableWidget = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractable-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/extractable-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,qCAAkC;AAYlC,IAAiB,iBAAiB,CAIjC;AAJD,WAAiB,iBAAiB;IAC9B,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,MAAM,YAAY,eAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"extractable-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/extractable-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,qCAAkC;AAYlC,IAAiB,iBAAiB,CAIjC;AAJD,WAAiB,iBAAiB;IAC9B,SAAgB,EAAE,CAAC,MAAe;QAC9B,OAAO,MAAM,YAAY,eAAM,IAAI,eAAe,IAAI,MAAM,IAAK,MAA4B,CAAC,aAAa,KAAK,IAAI,CAAC;IACzH,CAAC;IAFe,oBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,iBAAiB,iCAAjB,iBAAiB,QAIjC"}
|
package/lib/common/glob.d.ts
CHANGED
|
@@ -21,10 +21,10 @@ export interface IGlobOptions {
|
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
23
|
* Simplified glob matching. Supports a subset of glob patterns:
|
|
24
|
-
* -
|
|
25
|
-
* -
|
|
26
|
-
* -
|
|
27
|
-
* - simple brace expansion ({js,ts} => js or ts)
|
|
24
|
+
* - `*` matches anything inside a path segment
|
|
25
|
+
* - `?` matches 1 character inside a path segment
|
|
26
|
+
* - `**` matches anything including an empty path segment
|
|
27
|
+
* - simple brace expansion (`{js,ts}` => js or ts)
|
|
28
28
|
* - character ranges (using [...])
|
|
29
29
|
*/
|
|
30
30
|
export declare function match(pattern: string | IRelativePattern, path: string): boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.54.0",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@phosphor/signaling": "1",
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
|
-
"@theia/application-package": "1.
|
|
20
|
-
"@theia/request": "1.
|
|
19
|
+
"@theia/application-package": "1.54.0",
|
|
20
|
+
"@theia/request": "1.54.0",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -210,13 +210,13 @@
|
|
|
210
210
|
"watch": "theiaext watch"
|
|
211
211
|
},
|
|
212
212
|
"devDependencies": {
|
|
213
|
-
"@theia/ext-scripts": "1.
|
|
214
|
-
"@theia/re-exports": "1.
|
|
213
|
+
"@theia/ext-scripts": "1.54.0",
|
|
214
|
+
"@theia/re-exports": "1.54.0",
|
|
215
215
|
"minimist": "^1.2.0",
|
|
216
216
|
"nodejs-file-downloader": "4.13.0"
|
|
217
217
|
},
|
|
218
218
|
"nyc": {
|
|
219
219
|
"extends": "../../configs/nyc.json"
|
|
220
220
|
},
|
|
221
|
-
"gitHead": "
|
|
221
|
+
"gitHead": "8fb36a237db744cff6e78eaff1481e1f36bb7a69"
|
|
222
222
|
}
|
|
@@ -32,6 +32,13 @@ export interface AuthenticationSessionAccountInformation {
|
|
|
32
32
|
readonly id: string;
|
|
33
33
|
readonly label: string;
|
|
34
34
|
}
|
|
35
|
+
export interface AuthenticationProviderSessionOptions {
|
|
36
|
+
/**
|
|
37
|
+
* The account that is being asked about. If this is passed in, the provider should
|
|
38
|
+
* attempt to return the sessions that are only related to this account.
|
|
39
|
+
*/
|
|
40
|
+
account?: AuthenticationSessionAccountInformation;
|
|
41
|
+
}
|
|
35
42
|
|
|
36
43
|
export interface AuthenticationSession {
|
|
37
44
|
id: string;
|
|
@@ -82,16 +89,6 @@ export interface AuthenticationProvider {
|
|
|
82
89
|
|
|
83
90
|
updateSessionItems(event: AuthenticationProviderAuthenticationSessionsChangeEvent): Promise<void>;
|
|
84
91
|
|
|
85
|
-
/**
|
|
86
|
-
* @deprecated use `createSession` instead.
|
|
87
|
-
*/
|
|
88
|
-
login(scopes: string[]): Promise<AuthenticationSession>;
|
|
89
|
-
|
|
90
|
-
/**
|
|
91
|
-
* @deprecated use `removeSession` instead.
|
|
92
|
-
*/
|
|
93
|
-
logout(sessionId: string): Promise<void>;
|
|
94
|
-
|
|
95
92
|
/**
|
|
96
93
|
* An [event](#Event) which fires when the array of sessions has changed, or data
|
|
97
94
|
* within a session has changed.
|
|
@@ -102,16 +99,18 @@ export interface AuthenticationProvider {
|
|
|
102
99
|
* Get a list of sessions.
|
|
103
100
|
* @param scopes An optional list of scopes. If provided, the sessions returned should match
|
|
104
101
|
* these permissions, otherwise all sessions should be returned.
|
|
102
|
+
* @param account The optional account that you would like to get the session for
|
|
105
103
|
* @returns A promise that resolves to an array of authentication sessions.
|
|
106
104
|
*/
|
|
107
|
-
getSessions(scopes
|
|
105
|
+
getSessions(scopes: string[] | undefined, account?: AuthenticationSessionAccountInformation): Thenable<ReadonlyArray<AuthenticationSession>>;
|
|
108
106
|
|
|
109
107
|
/**
|
|
110
108
|
* Prompts a user to login.
|
|
111
109
|
* @param scopes A list of scopes, permissions, that the new session should be created with.
|
|
110
|
+
* @param options The options for createing the session
|
|
112
111
|
* @returns A promise that resolves to an authentication session.
|
|
113
112
|
*/
|
|
114
|
-
createSession(scopes: string[]): Thenable<AuthenticationSession>;
|
|
113
|
+
createSession(scopes: string[], options: AuthenticationProviderSessionOptions): Thenable<AuthenticationSession>;
|
|
115
114
|
|
|
116
115
|
/**
|
|
117
116
|
* Removes the session corresponding to session id.
|
|
@@ -134,10 +133,10 @@ export interface AuthenticationService {
|
|
|
134
133
|
|
|
135
134
|
readonly onDidChangeSessions: Event<{ providerId: string, label: string, event: AuthenticationProviderAuthenticationSessionsChangeEvent }>;
|
|
136
135
|
readonly onDidUpdateSignInCount: Event<number>;
|
|
137
|
-
getSessions(providerId: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>>;
|
|
136
|
+
getSessions(providerId: string, scopes?: string[], user?: AuthenticationSessionAccountInformation): Promise<ReadonlyArray<AuthenticationSession>>;
|
|
138
137
|
getLabel(providerId: string): string;
|
|
139
138
|
supportsMultipleAccounts(providerId: string): boolean;
|
|
140
|
-
login(providerId: string, scopes: string[]): Promise<AuthenticationSession>;
|
|
139
|
+
login(providerId: string, scopes: string[], options?: AuthenticationProviderSessionOptions): Promise<AuthenticationSession>;
|
|
141
140
|
logout(providerId: string, sessionId: string): Promise<void>;
|
|
142
141
|
|
|
143
142
|
signOutOfAccount(providerId: string, accountName: string): Promise<void>;
|
|
@@ -300,7 +299,7 @@ export class AuthenticationServiceImpl implements AuthenticationService {
|
|
|
300
299
|
}
|
|
301
300
|
|
|
302
301
|
const previousSize = this.signInRequestItems.size;
|
|
303
|
-
const sessions = await provider.getSessions();
|
|
302
|
+
const sessions = await provider.getSessions(undefined);
|
|
304
303
|
Object.keys(existingRequestsForProvider).forEach(requestedScopes => {
|
|
305
304
|
if (sessions.some(session => session.scopes.slice().sort().join('') === requestedScopes)) {
|
|
306
305
|
const sessionRequest = existingRequestsForProvider[requestedScopes];
|
|
@@ -411,19 +410,19 @@ export class AuthenticationServiceImpl implements AuthenticationService {
|
|
|
411
410
|
}
|
|
412
411
|
}
|
|
413
412
|
|
|
414
|
-
async getSessions(id: string, scopes?: string[]): Promise<ReadonlyArray<AuthenticationSession>> {
|
|
413
|
+
async getSessions(id: string, scopes?: string[], user?: AuthenticationSessionAccountInformation): Promise<ReadonlyArray<AuthenticationSession>> {
|
|
415
414
|
const authProvider = this.authenticationProviders.get(id);
|
|
416
415
|
if (authProvider) {
|
|
417
|
-
return authProvider.getSessions(scopes);
|
|
416
|
+
return authProvider.getSessions(scopes, user);
|
|
418
417
|
} else {
|
|
419
418
|
throw new Error(`No authentication provider '${id}' is currently registered.`);
|
|
420
419
|
}
|
|
421
420
|
}
|
|
422
421
|
|
|
423
|
-
async login(id: string, scopes: string[]): Promise<AuthenticationSession> {
|
|
422
|
+
async login(id: string, scopes: string[], options?: AuthenticationProviderSessionOptions): Promise<AuthenticationSession> {
|
|
424
423
|
const authProvider = this.authenticationProviders.get(id);
|
|
425
424
|
if (authProvider) {
|
|
426
|
-
return authProvider.createSession(scopes);
|
|
425
|
+
return authProvider.createSession(scopes, options || {});
|
|
427
426
|
} else {
|
|
428
427
|
throw new Error(`No authentication provider '${id}' is currently registered.`);
|
|
429
428
|
}
|
|
@@ -281,6 +281,15 @@ export const corePreferenceSchema: PreferenceSchema = {
|
|
|
281
281
|
default: 200,
|
|
282
282
|
minimum: 10,
|
|
283
283
|
description: nls.localize('theia/core/tabDefaultSize', 'Specifies the default size for tabs.')
|
|
284
|
+
},
|
|
285
|
+
'workbench.editorAssociations': {
|
|
286
|
+
type: 'object',
|
|
287
|
+
markdownDescription: nls.localizeByDefault('Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `"*.hex": "hexEditor.hexedit"`). These have precedence over the default behavior.'),
|
|
288
|
+
patternProperties: {
|
|
289
|
+
'.*': {
|
|
290
|
+
type: 'string'
|
|
291
|
+
}
|
|
292
|
+
}
|
|
284
293
|
}
|
|
285
294
|
}
|
|
286
295
|
};
|
|
@@ -19,7 +19,9 @@ import { Disposable } from '../common/disposable';
|
|
|
19
19
|
import { nls } from '../common/nls';
|
|
20
20
|
import { MaybePromise } from '../common/types';
|
|
21
21
|
import { URI } from '../common/uri';
|
|
22
|
-
import { QuickInputService } from './quick-input';
|
|
22
|
+
import { QuickInputService, QuickPickItem, QuickPickItemOrSeparator } from './quick-input';
|
|
23
|
+
import { PreferenceScope, PreferenceService } from './preferences';
|
|
24
|
+
import { getDefaultHandler } from './opener-service';
|
|
23
25
|
|
|
24
26
|
export interface OpenWithHandler {
|
|
25
27
|
/**
|
|
@@ -46,6 +48,11 @@ export interface OpenWithHandler {
|
|
|
46
48
|
* A returned value indicating a priority of this handler.
|
|
47
49
|
*/
|
|
48
50
|
canHandle(uri: URI): number;
|
|
51
|
+
/**
|
|
52
|
+
* Test whether this handler and open the given URI
|
|
53
|
+
* and return the order of this handler in the list.
|
|
54
|
+
*/
|
|
55
|
+
getOrder?(uri: URI): number;
|
|
49
56
|
/**
|
|
50
57
|
* Open a widget for the given URI and options.
|
|
51
58
|
* Resolve to an opened widget or undefined, e.g. if a page is opened.
|
|
@@ -54,12 +61,19 @@ export interface OpenWithHandler {
|
|
|
54
61
|
open(uri: URI): MaybePromise<object | undefined>;
|
|
55
62
|
}
|
|
56
63
|
|
|
64
|
+
export interface OpenWithQuickPickItem extends QuickPickItem {
|
|
65
|
+
handler: OpenWithHandler;
|
|
66
|
+
}
|
|
67
|
+
|
|
57
68
|
@injectable()
|
|
58
69
|
export class OpenWithService {
|
|
59
70
|
|
|
60
71
|
@inject(QuickInputService)
|
|
61
72
|
protected readonly quickInputService: QuickInputService;
|
|
62
73
|
|
|
74
|
+
@inject(PreferenceService)
|
|
75
|
+
protected readonly preferenceService: PreferenceService;
|
|
76
|
+
|
|
63
77
|
protected readonly handlers: OpenWithHandler[] = [];
|
|
64
78
|
|
|
65
79
|
registerHandler(handler: OpenWithHandler): Disposable {
|
|
@@ -73,17 +87,50 @@ export class OpenWithService {
|
|
|
73
87
|
}
|
|
74
88
|
|
|
75
89
|
async openWith(uri: URI): Promise<object | undefined> {
|
|
90
|
+
// Clone the object, because all objects returned by the preferences service are frozen.
|
|
91
|
+
const associations: Record<string, unknown> = { ...this.preferenceService.get('workbench.editorAssociations') };
|
|
92
|
+
const ext = `*${uri.path.ext}`;
|
|
76
93
|
const handlers = this.getHandlers(uri);
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
94
|
+
const ordered = handlers.slice().sort((a, b) => this.getOrder(b, uri) - this.getOrder(a, uri));
|
|
95
|
+
const defaultHandler = getDefaultHandler(uri, this.preferenceService) ?? handlers[0]?.id;
|
|
96
|
+
const items = this.getQuickPickItems(ordered, defaultHandler);
|
|
97
|
+
// Only offer to select a default editor when the file has a file extension
|
|
98
|
+
const extraItems: QuickPickItemOrSeparator[] = uri.path.ext ? [{
|
|
99
|
+
type: 'separator'
|
|
100
|
+
}, {
|
|
101
|
+
label: nls.localizeByDefault("Configure default editor for '{0}'...", ext)
|
|
102
|
+
}] : [];
|
|
103
|
+
const result = await this.quickInputService.pick<OpenWithQuickPickItem | { label: string }>([...items, ...extraItems], {
|
|
82
104
|
placeHolder: nls.localizeByDefault("Select editor for '{0}'", uri.path.base)
|
|
83
105
|
});
|
|
84
106
|
if (result) {
|
|
85
|
-
|
|
107
|
+
if ('handler' in result) {
|
|
108
|
+
return result.handler.open(uri);
|
|
109
|
+
} else if (result.label) {
|
|
110
|
+
const configureResult = await this.quickInputService.pick(items, {
|
|
111
|
+
placeHolder: nls.localizeByDefault("Select new default editor for '{0}'", ext)
|
|
112
|
+
});
|
|
113
|
+
if (configureResult) {
|
|
114
|
+
associations[ext] = configureResult.handler.id;
|
|
115
|
+
this.preferenceService.set('workbench.editorAssociations', associations, PreferenceScope.User);
|
|
116
|
+
return configureResult.handler.open(uri);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
86
119
|
}
|
|
120
|
+
return undefined;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
protected getQuickPickItems(handlers: OpenWithHandler[], defaultHandler?: string): OpenWithQuickPickItem[] {
|
|
124
|
+
return handlers.map(handler => ({
|
|
125
|
+
handler,
|
|
126
|
+
label: handler.label ?? handler.id,
|
|
127
|
+
detail: handler.providerName ?? '',
|
|
128
|
+
description: handler.id === defaultHandler ? nls.localizeByDefault('Default') : undefined
|
|
129
|
+
}));
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
protected getOrder(handler: OpenWithHandler, uri: URI): number {
|
|
133
|
+
return handler.getOrder ? handler.getOrder(uri) : handler.canHandle(uri);
|
|
87
134
|
}
|
|
88
135
|
|
|
89
136
|
getHandlers(uri: URI): OpenWithHandler[] {
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
import { named, injectable, inject } from 'inversify';
|
|
18
18
|
import URI from '../common/uri';
|
|
19
19
|
import { ContributionProvider, Prioritizeable, MaybePromise, Emitter, Event, Disposable } from '../common';
|
|
20
|
+
import { PreferenceService } from './preferences';
|
|
21
|
+
import { match } from '../common/glob';
|
|
20
22
|
|
|
21
23
|
export interface OpenerOptions {
|
|
22
24
|
}
|
|
@@ -96,6 +98,17 @@ export async function open(openerService: OpenerService, uri: URI, options?: Ope
|
|
|
96
98
|
return opener.open(uri, options);
|
|
97
99
|
}
|
|
98
100
|
|
|
101
|
+
export function getDefaultHandler(uri: URI, preferenceService: PreferenceService): string | undefined {
|
|
102
|
+
const associations = preferenceService.get('workbench.editorAssociations', {});
|
|
103
|
+
const defaultHandler = Object.entries(associations).find(([key]) => match(key, uri.path.base))?.[1];
|
|
104
|
+
if (typeof defaultHandler === 'string') {
|
|
105
|
+
return defaultHandler;
|
|
106
|
+
}
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export const defaultHandlerPriority = 100_000;
|
|
111
|
+
|
|
99
112
|
@injectable()
|
|
100
113
|
export class DefaultOpenerService implements OpenerService {
|
|
101
114
|
// Collection of open-handlers for custom-editor contributions.
|
|
@@ -20,7 +20,7 @@ import { NAVIGATION, RenderedToolbarItem } from './tab-bar-toolbar-types';
|
|
|
20
20
|
export const TOOLBAR_WRAPPER_ID_SUFFIX = '-as-tabbar-toolbar-item';
|
|
21
21
|
|
|
22
22
|
export class ToolbarMenuNodeWrapper implements RenderedToolbarItem {
|
|
23
|
-
constructor(protected readonly menuNode: MenuNode, readonly group
|
|
23
|
+
constructor(protected readonly menuNode: MenuNode, readonly group: string | undefined, readonly delegateMenuPath: MenuPath, readonly menuPath?: MenuPath) { }
|
|
24
24
|
get id(): string { return this.menuNode.id + TOOLBAR_WRAPPER_ID_SUFFIX; }
|
|
25
25
|
get command(): string { return this.menuNode.command ?? ''; };
|
|
26
26
|
get icon(): string | undefined { return this.menuNode.icon; }
|
|
@@ -116,11 +116,12 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
|
|
|
116
116
|
for (const grandchild of child.children) {
|
|
117
117
|
if (!grandchild.when || this.contextKeyService.match(grandchild.when, widget.node)) {
|
|
118
118
|
const menuPath = this.menuRegistry.getPath(grandchild);
|
|
119
|
-
result.push(new ToolbarMenuNodeWrapper(grandchild, child.id, menuPath));
|
|
119
|
+
result.push(new ToolbarMenuNodeWrapper(grandchild, child.id, delegate.menuPath, menuPath));
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
} else if (child.command) {
|
|
123
|
-
|
|
123
|
+
const menuPath = this.menuRegistry.getPath(child);
|
|
124
|
+
result.push(new ToolbarMenuNodeWrapper(child, undefined, delegate.menuPath, menuPath));
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
}
|
|
@@ -73,6 +73,10 @@ export interface TabBarToolbarItemBase {
|
|
|
73
73
|
* If no command is present, this menu will be opened.
|
|
74
74
|
*/
|
|
75
75
|
menuPath?: MenuPath;
|
|
76
|
+
/**
|
|
77
|
+
* The path of the menu delegate that contributed this toolbar item
|
|
78
|
+
*/
|
|
79
|
+
delegateMenuPath?: MenuPath;
|
|
76
80
|
contextKeyOverlays?: Record<string, string>;
|
|
77
81
|
/**
|
|
78
82
|
* Optional ordering string for placing the item within its group
|
|
@@ -405,8 +405,8 @@ export class TabBarToolbar extends ReactWidget {
|
|
|
405
405
|
return;
|
|
406
406
|
}
|
|
407
407
|
|
|
408
|
-
if (item.command && item.
|
|
409
|
-
this.menuCommandExecutor.executeCommand(item.
|
|
408
|
+
if (item.command && item.delegateMenuPath) {
|
|
409
|
+
this.menuCommandExecutor.executeCommand(item.delegateMenuPath, item.command, this.current);
|
|
410
410
|
} else if (item.command) {
|
|
411
411
|
this.commands.executeCommand(item.command, this.current);
|
|
412
412
|
} else if (item.menuPath) {
|
|
@@ -28,6 +28,6 @@ export interface ExtractableWidget extends Widget {
|
|
|
28
28
|
|
|
29
29
|
export namespace ExtractableWidget {
|
|
30
30
|
export function is(widget: unknown): widget is ExtractableWidget {
|
|
31
|
-
return widget instanceof Widget &&
|
|
31
|
+
return widget instanceof Widget && 'isExtractable' in widget && (widget as ExtractableWidget).isExtractable === true;
|
|
32
32
|
}
|
|
33
33
|
}
|
package/src/common/glob.ts
CHANGED
|
@@ -454,10 +454,10 @@ function toRegExp(pattern: string): ParsedStringPattern {
|
|
|
454
454
|
|
|
455
455
|
/**
|
|
456
456
|
* Simplified glob matching. Supports a subset of glob patterns:
|
|
457
|
-
* -
|
|
458
|
-
* -
|
|
459
|
-
* -
|
|
460
|
-
* - simple brace expansion ({js,ts} => js or ts)
|
|
457
|
+
* - `*` matches anything inside a path segment
|
|
458
|
+
* - `?` matches 1 character inside a path segment
|
|
459
|
+
* - `**` matches anything including an empty path segment
|
|
460
|
+
* - simple brace expansion (`{js,ts}` => js or ts)
|
|
461
461
|
* - character ranges (using [...])
|
|
462
462
|
*/
|
|
463
463
|
export function match(pattern: string | IRelativePattern, path: string): boolean;
|