@theia/core 1.60.0-next.47 → 1.60.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 +104 -8
- package/i18n/nls.de.json +104 -8
- package/i18n/nls.es.json +104 -8
- package/i18n/nls.fr.json +104 -8
- package/i18n/nls.hu.json +104 -8
- package/i18n/nls.it.json +104 -8
- package/i18n/nls.ja.json +104 -8
- package/i18n/nls.json +111 -15
- package/i18n/nls.ko.json +104 -8
- package/i18n/nls.pl.json +104 -8
- package/i18n/nls.pt-br.json +104 -8
- package/i18n/nls.ru.json +104 -8
- package/i18n/nls.tr.json +104 -8
- package/i18n/nls.zh-cn.json +104 -8
- package/i18n/nls.zh-tw.json +104 -8
- package/lib/browser/catalog.json +100 -23
- package/lib/browser/context-menu-renderer.d.ts +2 -1
- package/lib/browser/context-menu-renderer.d.ts.map +1 -1
- package/lib/browser/context-menu-renderer.js +3 -0
- package/lib/browser/context-menu-renderer.js.map +1 -1
- package/lib/browser/shell/application-shell.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +2 -1
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/shell/tab-bars.d.ts +7 -30
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +49 -76
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/theia-dock-panel.d.ts.map +1 -1
- package/lib/browser/shell/theia-dock-panel.js +9 -0
- package/lib/browser/shell/theia-dock-panel.js.map +1 -1
- package/lib/browser/widget-open-handler.d.ts +1 -1
- package/lib/browser/widget-open-handler.d.ts.map +1 -1
- package/lib/browser/widget-open-handler.js +2 -2
- package/lib/browser/widget-open-handler.js.map +1 -1
- package/lib/common/path.d.ts.map +1 -1
- package/lib/common/path.js +1 -4
- package/lib/common/path.js.map +1 -1
- package/lib/common/path.spec.js +3 -0
- package/lib/common/path.spec.js.map +1 -1
- package/lib/node/env-variables/env-variables-server.d.ts.map +1 -1
- package/lib/node/env-variables/env-variables-server.js +5 -7
- package/lib/node/env-variables/env-variables-server.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/context-menu-renderer.ts +4 -1
- package/src/browser/shell/application-shell.ts +3 -1
- package/src/browser/shell/tab-bars.ts +55 -86
- package/src/browser/shell/theia-dock-panel.ts +10 -0
- package/src/browser/style/tabs.css +2 -2
- package/src/browser/style/view-container.css +1 -0
- package/src/browser/widget-open-handler.ts +2 -2
- package/src/common/path.spec.ts +4 -0
- package/src/common/path.ts +1 -4
- package/src/node/env-variables/env-variables-server.ts +5 -6
package/lib/common/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/common/path.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../src/common/path.ts"],"names":[],"mappings":"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"}
|
package/lib/common/path.spec.js
CHANGED
|
@@ -229,6 +229,9 @@ describe('Path', () => {
|
|
|
229
229
|
(0, chai_1.expect)(new path_1.Path(path).toString()).eq(expected);
|
|
230
230
|
});
|
|
231
231
|
});
|
|
232
|
+
it('Should not produce joined paths with double initial //', () => {
|
|
233
|
+
(0, chai_1.expect)(new path_1.Path('/').join('/something/absolute').toString()).eq('/something/absolute');
|
|
234
|
+
});
|
|
232
235
|
const linuxHome = '/home/test-user';
|
|
233
236
|
const windowsHome = '/C:/Users/test-user';
|
|
234
237
|
describe('Linux', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.spec.js","sourceRoot":"","sources":["../../src/common/path.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"path.spec.js","sourceRoot":"","sources":["../../src/common/path.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-variables-server.d.ts","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IAC7D,SAAS,CAAC,QAAQ,CAAC,UAAU,SAAwC;IACrE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAM;;cAevD,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"env-variables-server.d.ts","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBACa,sBAAuB,YAAW,kBAAkB;IAE7D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;IAC7D,SAAS,CAAC,QAAQ,CAAC,UAAU,SAAwC;IACrE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAM;;cAevD,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAuB/C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9B,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAItC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAO7D,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAapC;;OAEG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAY1D"}
|
|
@@ -52,21 +52,19 @@ let EnvVariablesServerImpl = class EnvVariablesServerImpl {
|
|
|
52
52
|
const dataFolderPath = (0, path_1.join)(backend_application_1.BackendApplicationPath, 'data');
|
|
53
53
|
const userDataPath = (0, path_1.join)(dataFolderPath, 'user-data');
|
|
54
54
|
const dataFolderExists = (_a = (_c = this.pathExistenceCache)[dataFolderPath]) !== null && _a !== void 0 ? _a : (_c[dataFolderPath] = await (0, fs_extra_1.pathExists)(dataFolderPath));
|
|
55
|
+
let theiaConfigDir;
|
|
55
56
|
if (dataFolderExists) {
|
|
56
57
|
const userDataExists = (_b = (_d = this.pathExistenceCache)[userDataPath]) !== null && _b !== void 0 ? _b : (_d[userDataPath] = await (0, fs_extra_1.pathExists)(userDataPath));
|
|
57
|
-
if (userDataExists) {
|
|
58
|
-
process.env.THEIA_CONFIG_DIR = userDataPath;
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
58
|
+
if (!userDataExists) {
|
|
61
59
|
await (0, fs_extra_1.mkdir)(userDataPath);
|
|
62
|
-
process.env.THEIA_CONFIG_DIR = userDataPath;
|
|
63
60
|
this.pathExistenceCache[userDataPath] = true;
|
|
64
61
|
}
|
|
62
|
+
theiaConfigDir = userDataPath;
|
|
65
63
|
}
|
|
66
64
|
else {
|
|
67
|
-
|
|
65
|
+
theiaConfigDir = (0, path_1.join)((0, os_1.homedir)(), backend_application_config_provider_1.BackendApplicationConfigProvider.get().configurationFolder);
|
|
68
66
|
}
|
|
69
|
-
return file_uri_1.FileUri.create(
|
|
67
|
+
return file_uri_1.FileUri.create(theiaConfigDir).toString();
|
|
70
68
|
}
|
|
71
69
|
async getExecPath() {
|
|
72
70
|
return process.execPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-variables-server.js","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,+BAA4B;AAC5B,2BAA6B;AAC7B,yCAAuC;AACvC,uCAAuC;AACvC,uCAA6C;AAE7C,wCAA4C;AAC5C,oDAAgD;AAChD,gEAAgE;AAChE,gGAA0F;AAGnF,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAO/B;QALmB,SAAI,GAAmC,EAAE,CAAC;QAC1C,eAAU,GAAG,kBAAO,CAAC,MAAM,CAAC,IAAA,YAAO,GAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAElD,uBAAkB,GAA+B,EAAE,CAAC;QAGnE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC9C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,YAAY,GAAG,CAAC,CAAC,CAAC;QACtG,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YACvC,IAAI,OAAO,GAAG,GAAG,CAAC;YAClB,IAAI,cAAS,EAAE,CAAC;gBACZ,OAAO,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAChC,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,kBAAkB;;;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC/B,4EAA4E;YAC5E,OAAO,kBAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,CAAC;QAED,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,4CAAsB,EAAE,MAAM,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QACvD,MAAM,gBAAgB,eAAG,IAAI,CAAC,kBAAkB,EAAC,cAAc,wCAAd,cAAc,IAAM,MAAM,IAAA,qBAAU,EAAC,cAAc,CAAC,CAAA,CAAC;QACtG,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,cAAc,eAAG,IAAI,CAAC,kBAAkB,EAAC,YAAY,wCAAZ,YAAY,IAAM,MAAM,IAAA,qBAAU,EAAC,YAAY,CAAC,CAAA,CAAC;YAChG,IAAI,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"env-variables-server.js","sourceRoot":"","sources":["../../../src/node/env-variables/env-variables-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.60.0
|
|
3
|
+
"version": "1.60.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",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"@lumino/virtualdom": "^2.0.2",
|
|
18
18
|
"@lumino/widgets": "2.5.0",
|
|
19
19
|
"@parcel/watcher": "^2.5.0",
|
|
20
|
-
"@theia/application-package": "1.60.0
|
|
21
|
-
"@theia/request": "1.60.0
|
|
20
|
+
"@theia/application-package": "1.60.0",
|
|
21
|
+
"@theia/request": "1.60.0",
|
|
22
22
|
"@types/body-parser": "^1.16.4",
|
|
23
23
|
"@types/cookie": "^0.3.3",
|
|
24
24
|
"@types/dompurify": "^2.2.2",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"markdown-it": "^12.3.2",
|
|
60
60
|
"msgpackr": "^1.10.2",
|
|
61
61
|
"p-debounce": "^2.1.0",
|
|
62
|
-
"perfect-scrollbar": "
|
|
62
|
+
"perfect-scrollbar": "1.5.5",
|
|
63
63
|
"react": "^18.2.0",
|
|
64
64
|
"react-dom": "^18.2.0",
|
|
65
65
|
"react-tooltip": "^4.2.21",
|
|
@@ -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.60.0",
|
|
214
|
+
"@theia/re-exports": "1.60.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": "193fa55d7e26aa9dc8acba3ae3b99b0182f3603f"
|
|
222
222
|
}
|
|
@@ -31,7 +31,7 @@ export function coordinateFromAnchor(anchor: Anchor): Coordinate {
|
|
|
31
31
|
return { x, y };
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
export
|
|
34
|
+
export class ContextMenuAccess implements Disposable {
|
|
35
35
|
|
|
36
36
|
protected readonly toDispose = new DisposableCollection();
|
|
37
37
|
readonly onDispose = this.toDispose.onDispose;
|
|
@@ -62,6 +62,9 @@ export abstract class ContextMenuRenderer {
|
|
|
62
62
|
get current(): ContextMenuAccess | undefined {
|
|
63
63
|
return this._current;
|
|
64
64
|
}
|
|
65
|
+
set current(current: ContextMenuAccess | undefined) {
|
|
66
|
+
this.setCurrent(current);
|
|
67
|
+
}
|
|
65
68
|
protected setCurrent(current: ContextMenuAccess | undefined): void {
|
|
66
69
|
if (this._current === current) {
|
|
67
70
|
return;
|
|
@@ -123,7 +123,9 @@ export class DockPanelRenderer implements DockLayout.IRenderer {
|
|
|
123
123
|
this.tabBarToolbarFactory,
|
|
124
124
|
this.breadcrumbsRendererFactory,
|
|
125
125
|
{
|
|
126
|
-
renderer
|
|
126
|
+
renderer
|
|
127
|
+
},
|
|
128
|
+
{
|
|
127
129
|
// Scroll bar options
|
|
128
130
|
handlers: ['drag-thumb', 'keyboard', 'wheel', 'touch'],
|
|
129
131
|
useBothWheelAxes: true,
|
|
@@ -20,7 +20,7 @@ import { VirtualElement, h, VirtualDOM, ElementInlineStyle } from '@lumino/virtu
|
|
|
20
20
|
import { Disposable, DisposableCollection, MenuPath, notEmpty, SelectionService, CommandService, nls, ArrayUtils } from '../../common';
|
|
21
21
|
import { ContextMenuRenderer } from '../context-menu-renderer';
|
|
22
22
|
import { Signal, Slot } from '@lumino/signaling';
|
|
23
|
-
import { Message
|
|
23
|
+
import { Message } from '@lumino/messaging';
|
|
24
24
|
import { ArrayExt } from '@lumino/algorithm';
|
|
25
25
|
import { ElementExt } from '@lumino/domutils';
|
|
26
26
|
import { TabBarToolbarRegistry, TabBarToolbar } from './tab-bar-toolbar';
|
|
@@ -697,9 +697,8 @@ export interface TabBarPrivateMethods {
|
|
|
697
697
|
*/
|
|
698
698
|
export class ScrollableTabBar extends TabBar<Widget> {
|
|
699
699
|
|
|
700
|
-
protected scrollBar
|
|
700
|
+
protected scrollBar: PerfectScrollbar | undefined;
|
|
701
701
|
|
|
702
|
-
protected scrollBarFactory: () => PerfectScrollbar;
|
|
703
702
|
protected pendingReveal?: Promise<void>;
|
|
704
703
|
protected isMouseOver = false;
|
|
705
704
|
protected needsRecompute = false;
|
|
@@ -712,11 +711,27 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
712
711
|
protected openTabsContainer: HTMLDivElement;
|
|
713
712
|
protected openTabsRoot: Root;
|
|
714
713
|
|
|
715
|
-
constructor(options?: TabBar.IOptions<Widget
|
|
714
|
+
constructor(options?: TabBar.IOptions<Widget>, protected readonly scrollbarOptions?: PerfectScrollbar.Options, dynamicTabOptions?: ScrollableTabBar.Options) {
|
|
716
715
|
super(options);
|
|
717
|
-
this.scrollBarFactory = () => new PerfectScrollbar(this.scrollbarHost, options);
|
|
718
716
|
this._dynamicTabOptions = dynamicTabOptions;
|
|
719
|
-
this.
|
|
717
|
+
this.topRow = document.createElement('div');
|
|
718
|
+
this.topRow.classList.add('theia-tabBar-tab-row');
|
|
719
|
+
this.node.appendChild(this.topRow);
|
|
720
|
+
|
|
721
|
+
const contentNode = this.contentNode;
|
|
722
|
+
if (!contentNode) {
|
|
723
|
+
throw new Error('tab bar does not have the content node.');
|
|
724
|
+
}
|
|
725
|
+
this.node.removeChild(contentNode);
|
|
726
|
+
this.contentContainer = document.createElement('div');
|
|
727
|
+
this.contentContainer.classList.add(ScrollableTabBar.Styles.TAB_BAR_CONTENT_CONTAINER);
|
|
728
|
+
this.contentContainer.appendChild(contentNode);
|
|
729
|
+
this.topRow.appendChild(this.contentContainer);
|
|
730
|
+
|
|
731
|
+
this.openTabsContainer = document.createElement('div');
|
|
732
|
+
this.openTabsContainer.classList.add('theia-tabBar-open-tabs');
|
|
733
|
+
this.openTabsRoot = createRoot(this.openTabsContainer);
|
|
734
|
+
this.topRow.appendChild(this.openTabsContainer);
|
|
720
735
|
}
|
|
721
736
|
|
|
722
737
|
set dynamicTabOptions(options: ScrollableTabBar.Options | undefined) {
|
|
@@ -753,39 +768,7 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
753
768
|
(this as unknown as TabBarPrivateMethods)._releaseMouse();
|
|
754
769
|
}
|
|
755
770
|
|
|
756
|
-
/**
|
|
757
|
-
* Restructures the DOM defined in Lumino.
|
|
758
|
-
*
|
|
759
|
-
* By default the tabs (`li`) are contained in the `this.contentNode` (`ul`) which is wrapped in a `div` (`this.node`).
|
|
760
|
-
* Instead of this structure, we add a container for the `this.contentNode` and for the toolbar.
|
|
761
|
-
* The scrollbar will only work for the `ul` part but it does not affect the toolbar, so it can be on the right hand-side.
|
|
762
|
-
*/
|
|
763
|
-
protected rewireDOM(): void {
|
|
764
|
-
const contentNode = this.node.getElementsByClassName(ScrollableTabBar.Styles.TAB_BAR_CONTENT)[0];
|
|
765
|
-
if (!contentNode) {
|
|
766
|
-
throw new Error(`'this.node' does not have the content as a direct child with class name '${ScrollableTabBar.Styles.TAB_BAR_CONTENT}'.`);
|
|
767
|
-
}
|
|
768
|
-
this.node.removeChild(contentNode);
|
|
769
|
-
this.contentContainer = document.createElement('div');
|
|
770
|
-
this.contentContainer.classList.add(ScrollableTabBar.Styles.TAB_BAR_CONTENT_CONTAINER);
|
|
771
|
-
this.contentContainer.appendChild(contentNode);
|
|
772
|
-
|
|
773
|
-
this.topRow = document.createElement('div');
|
|
774
|
-
this.topRow.classList.add('theia-tabBar-tab-row');
|
|
775
|
-
this.topRow.appendChild(this.contentContainer);
|
|
776
|
-
|
|
777
|
-
this.openTabsContainer = document.createElement('div');
|
|
778
|
-
this.openTabsContainer.classList.add('theia-tabBar-open-tabs');
|
|
779
|
-
this.openTabsRoot = createRoot(this.openTabsContainer);
|
|
780
|
-
this.topRow.appendChild(this.openTabsContainer);
|
|
781
|
-
|
|
782
|
-
this.node.appendChild(this.topRow);
|
|
783
|
-
}
|
|
784
|
-
|
|
785
771
|
protected override onAfterAttach(msg: Message): void {
|
|
786
|
-
if (!this.scrollBar) {
|
|
787
|
-
this.scrollBar = this.scrollBarFactory();
|
|
788
|
-
}
|
|
789
772
|
this.node.addEventListener('mouseenter', () => { this.isMouseOver = true; });
|
|
790
773
|
this.node.addEventListener('mouseleave', () => {
|
|
791
774
|
this.isMouseOver = false;
|
|
@@ -795,14 +778,12 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
795
778
|
});
|
|
796
779
|
|
|
797
780
|
super.onAfterAttach(msg);
|
|
781
|
+
this.scrollBar = new PerfectScrollbar(this.contentContainer, this.scrollbarOptions);
|
|
798
782
|
}
|
|
799
783
|
|
|
800
784
|
protected override onBeforeDetach(msg: Message): void {
|
|
801
785
|
super.onBeforeDetach(msg);
|
|
802
|
-
|
|
803
|
-
this.scrollBar.destroy();
|
|
804
|
-
this.scrollBar = undefined;
|
|
805
|
-
}
|
|
786
|
+
this.scrollBar?.destroy();
|
|
806
787
|
}
|
|
807
788
|
|
|
808
789
|
protected override onUpdateRequest(msg: Message): void {
|
|
@@ -826,7 +807,7 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
826
807
|
} else {
|
|
827
808
|
this.needsRecompute = false;
|
|
828
809
|
if (this.orientation === 'horizontal') {
|
|
829
|
-
let availableWidth = this.
|
|
810
|
+
let availableWidth = this.contentNode.clientWidth;
|
|
830
811
|
let effectiveWidth = availableWidth;
|
|
831
812
|
if (!this.openTabsContainer.classList.contains('lm-mod-hidden')) {
|
|
832
813
|
availableWidth += this.openTabsContainer.getBoundingClientRect().width;
|
|
@@ -890,7 +871,7 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
890
871
|
window.requestAnimationFrame(() => {
|
|
891
872
|
const tab = this.contentNode.children[index] as HTMLElement;
|
|
892
873
|
if (tab && this.isVisible) {
|
|
893
|
-
const parent = this.
|
|
874
|
+
const parent = this.contentNode;
|
|
894
875
|
if (this.orientation === 'horizontal') {
|
|
895
876
|
const scroll = parent.scrollLeft;
|
|
896
877
|
const left = tab.offsetLeft;
|
|
@@ -924,25 +905,6 @@ export class ScrollableTabBar extends TabBar<Widget> {
|
|
|
924
905
|
this.pendingReveal = result;
|
|
925
906
|
return result;
|
|
926
907
|
}
|
|
927
|
-
|
|
928
|
-
/**
|
|
929
|
-
* Overrides the `contentNode` property getter in LuminoJS' TabBar.
|
|
930
|
-
*/
|
|
931
|
-
// @ts-expect-error TS2611 `TabBar<T>.contentNode` is declared as `readonly contentNode` but is implemented as a getter.
|
|
932
|
-
get contentNode(): HTMLUListElement {
|
|
933
|
-
return this.node.getElementsByClassName(ToolbarAwareTabBar.Styles.TAB_BAR_CONTENT)[0] as HTMLUListElement;
|
|
934
|
-
}
|
|
935
|
-
|
|
936
|
-
/**
|
|
937
|
-
* Overrides the scrollable host from the parent class.
|
|
938
|
-
*/
|
|
939
|
-
protected get scrollbarHost(): HTMLElement {
|
|
940
|
-
return this.tabBarContainer;
|
|
941
|
-
}
|
|
942
|
-
|
|
943
|
-
protected get tabBarContainer(): HTMLElement {
|
|
944
|
-
return this.node.getElementsByClassName(ToolbarAwareTabBar.Styles.TAB_BAR_CONTENT_CONTAINER)[0] as HTMLElement;
|
|
945
|
-
}
|
|
946
908
|
}
|
|
947
909
|
|
|
948
910
|
export namespace ScrollableTabBar {
|
|
@@ -953,7 +915,6 @@ export namespace ScrollableTabBar {
|
|
|
953
915
|
}
|
|
954
916
|
export namespace Styles {
|
|
955
917
|
|
|
956
|
-
export const TAB_BAR_CONTENT = 'lm-TabBar-content';
|
|
957
918
|
export const TAB_BAR_CONTENT_CONTAINER = 'lm-TabBar-content-container';
|
|
958
919
|
|
|
959
920
|
}
|
|
@@ -978,32 +939,54 @@ export class ToolbarAwareTabBar extends ScrollableTabBar {
|
|
|
978
939
|
protected toolbar: TabBarToolbar | undefined;
|
|
979
940
|
protected breadcrumbsContainer: HTMLElement;
|
|
980
941
|
protected readonly breadcrumbsRenderer: BreadcrumbsRenderer;
|
|
942
|
+
protected dockPanel: TheiaDockPanel;
|
|
981
943
|
|
|
982
944
|
constructor(
|
|
983
945
|
protected readonly tabBarToolbarRegistry: TabBarToolbarRegistry,
|
|
984
946
|
protected readonly tabBarToolbarFactory: () => TabBarToolbar,
|
|
985
947
|
protected readonly breadcrumbsRendererFactory: BreadcrumbsRendererFactory,
|
|
986
|
-
options?: TabBar.IOptions<Widget
|
|
948
|
+
options?: TabBar.IOptions<Widget>,
|
|
949
|
+
scrollbarOptions?: PerfectScrollbar.Options,
|
|
987
950
|
dynamicTabOptions?: ScrollableTabBar.Options
|
|
988
951
|
) {
|
|
989
|
-
super(options, dynamicTabOptions);
|
|
952
|
+
super(options, scrollbarOptions, dynamicTabOptions);
|
|
953
|
+
|
|
990
954
|
this.breadcrumbsRenderer = this.breadcrumbsRendererFactory();
|
|
991
|
-
this.
|
|
955
|
+
this.breadcrumbsContainer = document.createElement('div');
|
|
956
|
+
this.breadcrumbsContainer.classList.add('theia-tabBar-breadcrumb-row');
|
|
957
|
+
this.breadcrumbsContainer.appendChild(this.breadcrumbsRenderer.host);
|
|
958
|
+
this.node.appendChild(this.breadcrumbsContainer);
|
|
959
|
+
|
|
992
960
|
this.toolbar = this.tabBarToolbarFactory();
|
|
993
961
|
this.toDispose.push(this.tabBarToolbarRegistry.onDidChange(() => this.update()));
|
|
994
962
|
this.toDispose.push(this.breadcrumbsRenderer);
|
|
963
|
+
|
|
964
|
+
if (!this.breadcrumbsRenderer.active) {
|
|
965
|
+
this.breadcrumbsContainer.style.setProperty('display', 'none');
|
|
966
|
+
} else {
|
|
967
|
+
this.node.classList.add('theia-tabBar-multirow');
|
|
968
|
+
}
|
|
995
969
|
this.toDispose.push(this.breadcrumbsRenderer.onDidChangeActiveState(active => {
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
970
|
+
if (active) {
|
|
971
|
+
this.breadcrumbsContainer.style.removeProperty('display');
|
|
972
|
+
this.node.classList.add('theia-tabBar-multirow');
|
|
973
|
+
} else {
|
|
974
|
+
this.breadcrumbsContainer.style.setProperty('display', 'none');
|
|
975
|
+
this.node.classList.remove('theia-tabBar-multirow');
|
|
976
|
+
}
|
|
977
|
+
if (this.dockPanel) {
|
|
978
|
+
this.dockPanel.fit();
|
|
999
979
|
}
|
|
1000
980
|
}));
|
|
1001
|
-
this.node.classList.toggle('theia-tabBar-multirow', this.breadcrumbsRenderer.active);
|
|
1002
981
|
const handler = () => this.updateBreadcrumbs();
|
|
1003
982
|
this.currentChanged.connect(handler);
|
|
1004
983
|
this.toDispose.push(Disposable.create(() => this.currentChanged.disconnect(handler)));
|
|
1005
984
|
}
|
|
1006
985
|
|
|
986
|
+
setDockPanel(panel: TheiaDockPanel): void {
|
|
987
|
+
this.dockPanel = panel;
|
|
988
|
+
}
|
|
989
|
+
|
|
1007
990
|
protected async updateBreadcrumbs(): Promise<void> {
|
|
1008
991
|
const current = this.currentTitle?.owner;
|
|
1009
992
|
const uri = NavigatableWidget.is(current) ? current.getResourceUri() : undefined;
|
|
@@ -1062,20 +1045,6 @@ export class ToolbarAwareTabBar extends ScrollableTabBar {
|
|
|
1062
1045
|
protected isOver(event: Event, element: Element): boolean {
|
|
1063
1046
|
return element && event.target instanceof Element && element.contains(event.target);
|
|
1064
1047
|
}
|
|
1065
|
-
|
|
1066
|
-
/**
|
|
1067
|
-
* Restructures the DOM defined in Lumino.
|
|
1068
|
-
*
|
|
1069
|
-
* By default the tabs (`li`) are contained in the `this.contentNode` (`ul`) which is wrapped in a `div` (`this.node`).
|
|
1070
|
-
* Instead of this structure, we add a container for the `this.contentNode` and for the toolbar.
|
|
1071
|
-
* The scrollbar will only work for the `ul` part but it does not affect the toolbar, so it can be on the right hand-side.
|
|
1072
|
-
*/
|
|
1073
|
-
protected addBreadcrumbs(): void {
|
|
1074
|
-
this.breadcrumbsContainer = document.createElement('div');
|
|
1075
|
-
this.breadcrumbsContainer.classList.add('theia-tabBar-breadcrumb-row');
|
|
1076
|
-
this.breadcrumbsContainer.appendChild(this.breadcrumbsRenderer.host);
|
|
1077
|
-
this.node.appendChild(this.breadcrumbsContainer);
|
|
1078
|
-
}
|
|
1079
1048
|
}
|
|
1080
1049
|
|
|
1081
1050
|
/**
|
|
@@ -1256,7 +1225,7 @@ export class SideTabBar extends ScrollableTabBar {
|
|
|
1256
1225
|
return;
|
|
1257
1226
|
}
|
|
1258
1227
|
|
|
1259
|
-
if ((newOverflowingTabs.length !== this.tabsOverflowData?.titles.length ?? 0) ||
|
|
1228
|
+
if ((newOverflowingTabs.length !== (this.tabsOverflowData?.titles.length ?? 0)) ||
|
|
1260
1229
|
newOverflowingTabs.find((newTitle, i) => newTitle !== this.tabsOverflowData?.titles[i]) !== undefined) {
|
|
1261
1230
|
this.tabsOverflowData = { titles: newOverflowingTabs, startIndex };
|
|
1262
1231
|
this.tabsOverflowChanged.emit(this.tabsOverflowData);
|
|
@@ -21,6 +21,7 @@ import { Disposable, DisposableCollection } from '../../common/disposable';
|
|
|
21
21
|
import { UnsafeWidgetUtilities } from '../widgets';
|
|
22
22
|
import { CorePreferences } from '../core-preferences';
|
|
23
23
|
import { Emitter, Event, environment } from '../../common';
|
|
24
|
+
import { ToolbarAwareTabBar } from './tab-bars';
|
|
24
25
|
|
|
25
26
|
export const MAXIMIZED_CLASS = 'theia-maximized';
|
|
26
27
|
export const ACTIVE_TABBAR_CLASS = 'theia-tabBar-active';
|
|
@@ -63,6 +64,15 @@ export class TheiaDockPanel extends DockPanel {
|
|
|
63
64
|
this.markAsCurrent(args.currentTitle || undefined);
|
|
64
65
|
super['_onCurrentChanged'](sender, args);
|
|
65
66
|
};
|
|
67
|
+
|
|
68
|
+
this['_createTabBar'] = () => {
|
|
69
|
+
// necessary for https://github.com/eclipse-theia/theia/issues/15273
|
|
70
|
+
const tabBar = super['_createTabBar']();
|
|
71
|
+
if (tabBar instanceof ToolbarAwareTabBar) {
|
|
72
|
+
tabBar.setDockPanel(this);
|
|
73
|
+
}
|
|
74
|
+
return tabBar;
|
|
75
|
+
};
|
|
66
76
|
this['_onTabActivateRequested'] = (sender: TabBar<Widget>, args: TabBar.ITabActivateRequestedArgs<Widget>) => {
|
|
67
77
|
this.markAsCurrent(args.title);
|
|
68
78
|
super['_onTabActivateRequested'](sender, args);
|
|
@@ -459,7 +459,7 @@
|
|
|
459
459
|
}
|
|
460
460
|
|
|
461
461
|
.theia-tabBar-breadcrumb-row {
|
|
462
|
-
|
|
462
|
+
width: 100%;
|
|
463
463
|
}
|
|
464
464
|
|
|
465
465
|
.lm-TabBar.theia-tabBar-multirow[data-orientation="horizontal"] {
|
|
@@ -470,7 +470,7 @@
|
|
|
470
470
|
.lm-TabBar[data-orientation="horizontal"] .theia-tabBar-tab-row {
|
|
471
471
|
display: flex;
|
|
472
472
|
flex-flow: row nowrap;
|
|
473
|
-
|
|
473
|
+
width: 100%;
|
|
474
474
|
}
|
|
475
475
|
|
|
476
476
|
.lm-TabBar[data-orientation="vertical"] .theia-tabBar-tab-row {
|
|
@@ -90,10 +90,10 @@ export abstract class WidgetOpenHandler<W extends BaseWidget> implements OpenHan
|
|
|
90
90
|
*/
|
|
91
91
|
async open(uri: URI, options?: WidgetOpenerOptions): Promise<W> {
|
|
92
92
|
const widget = await this.getOrCreateWidget(uri, options);
|
|
93
|
-
await this.doOpen(widget, options);
|
|
93
|
+
await this.doOpen(widget, uri, options);
|
|
94
94
|
return widget;
|
|
95
95
|
}
|
|
96
|
-
protected async doOpen(widget: W, options?: WidgetOpenerOptions): Promise<void> {
|
|
96
|
+
protected async doOpen(widget: W, uri: URI, options?: WidgetOpenerOptions): Promise<void> {
|
|
97
97
|
const op: WidgetOpenerOptions = {
|
|
98
98
|
mode: 'activate',
|
|
99
99
|
...options
|
package/src/common/path.spec.ts
CHANGED
|
@@ -271,6 +271,10 @@ describe('Path', () => {
|
|
|
271
271
|
});
|
|
272
272
|
});
|
|
273
273
|
|
|
274
|
+
it('Should not produce joined paths with double initial //', () => {
|
|
275
|
+
expect(new Path('/').join('/something/absolute').toString()).eq('/something/absolute');
|
|
276
|
+
});
|
|
277
|
+
|
|
274
278
|
const linuxHome = '/home/test-user';
|
|
275
279
|
const windowsHome = '/C:/Users/test-user';
|
|
276
280
|
|
package/src/common/path.ts
CHANGED
|
@@ -215,10 +215,7 @@ export class Path {
|
|
|
215
215
|
if (!relativePath) {
|
|
216
216
|
return this;
|
|
217
217
|
}
|
|
218
|
-
|
|
219
|
-
return new Path(this.raw + relativePath);
|
|
220
|
-
}
|
|
221
|
-
return new Path(this.raw + Path.separator + relativePath);
|
|
218
|
+
return new Path(this.raw + Path.separator + relativePath).normalize();
|
|
222
219
|
}
|
|
223
220
|
|
|
224
221
|
/**
|
|
@@ -55,19 +55,18 @@ export class EnvVariablesServerImpl implements EnvVariablesServer {
|
|
|
55
55
|
const dataFolderPath = join(BackendApplicationPath, 'data');
|
|
56
56
|
const userDataPath = join(dataFolderPath, 'user-data');
|
|
57
57
|
const dataFolderExists = this.pathExistenceCache[dataFolderPath] ??= await pathExists(dataFolderPath);
|
|
58
|
+
let theiaConfigDir: string;
|
|
58
59
|
if (dataFolderExists) {
|
|
59
60
|
const userDataExists = this.pathExistenceCache[userDataPath] ??= await pathExists(userDataPath);
|
|
60
|
-
if (userDataExists) {
|
|
61
|
-
process.env.THEIA_CONFIG_DIR = userDataPath;
|
|
62
|
-
} else {
|
|
61
|
+
if (!userDataExists) {
|
|
63
62
|
await mkdir(userDataPath);
|
|
64
|
-
process.env.THEIA_CONFIG_DIR = userDataPath;
|
|
65
63
|
this.pathExistenceCache[userDataPath] = true;
|
|
66
64
|
}
|
|
65
|
+
theiaConfigDir = userDataPath;
|
|
67
66
|
} else {
|
|
68
|
-
|
|
67
|
+
theiaConfigDir = join(homedir(), BackendApplicationConfigProvider.get().configurationFolder);
|
|
69
68
|
}
|
|
70
|
-
return FileUri.create(
|
|
69
|
+
return FileUri.create(theiaConfigDir).toString();
|
|
71
70
|
}
|
|
72
71
|
|
|
73
72
|
async getExecPath(): Promise<string> {
|