@theia/plugin-ext 1.27.0-next.35 → 1.27.0-next.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/main/browser/main-context.d.ts.map +1 -1
- package/lib/main/browser/main-context.js +2 -1
- package/lib/main/browser/main-context.js.map +1 -1
- package/lib/main/browser/plugin-shared-style.d.ts +3 -1
- package/lib/main/browser/plugin-shared-style.d.ts.map +1 -1
- package/lib/main/browser/plugin-shared-style.js +15 -4
- package/lib/main/browser/plugin-shared-style.js.map +1 -1
- package/lib/main/browser/theming-main.d.ts +2 -1
- package/lib/main/browser/theming-main.d.ts.map +1 -1
- package/lib/main/browser/theming-main.js +3 -6
- package/lib/main/browser/theming-main.js.map +1 -1
- package/lib/main/browser/webview/webview-theme-data-provider.d.ts +2 -0
- package/lib/main/browser/webview/webview-theme-data-provider.d.ts.map +1 -1
- package/lib/main/browser/webview/webview-theme-data-provider.js +5 -1
- package/lib/main/browser/webview/webview-theme-data-provider.js.map +1 -1
- package/package.json +24 -24
- package/src/main/browser/main-context.ts +2 -1
- package/src/main/browser/plugin-shared-style.ts +7 -4
- package/src/main/browser/theming-main.ts +3 -7
- package/src/main/browser/webview/webview-theme-data-provider.ts +5 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-context.d.ts","sourceRoot":"","sources":["../../../src/main/browser/main-context.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"main-context.d.ts","sourceRoot":"","sources":["../../../src/main/browser/main-context.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AA2CxD,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,IAAI,CA4HtF"}
|
|
@@ -44,6 +44,7 @@ const webview_views_main_1 = require("./webview-views/webview-views-main");
|
|
|
44
44
|
const monaco_languages_1 = require("@theia/monaco/lib/browser/monaco-languages");
|
|
45
45
|
const notification_1 = require("../../plugin/notification");
|
|
46
46
|
const resource_1 = require("@theia/core/lib/common/resource");
|
|
47
|
+
const theming_1 = require("@theia/core/lib/browser/theming");
|
|
47
48
|
function setUpPluginApi(rpc, container) {
|
|
48
49
|
const authenticationMain = new authentication_main_1.AuthenticationMainImpl(rpc, container);
|
|
49
50
|
rpc.set(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.AUTHENTICATION_MAIN, authenticationMain);
|
|
@@ -128,7 +129,7 @@ function setUpPluginApi(rpc, container) {
|
|
|
128
129
|
rpc.set(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.LABEL_SERVICE_MAIN, labelServiceMain);
|
|
129
130
|
const timelineMain = new timeline_main_1.TimelineMainImpl(rpc, container);
|
|
130
131
|
rpc.set(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.TIMELINE_MAIN, timelineMain);
|
|
131
|
-
const themingMain = new theming_main_1.ThemingMainImpl(rpc);
|
|
132
|
+
const themingMain = new theming_main_1.ThemingMainImpl(rpc, container.get(theming_1.ThemeService));
|
|
132
133
|
rpc.set(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.THEMING_MAIN, themingMain);
|
|
133
134
|
const commentsMain = new comments_main_1.CommentsMainImp(rpc, container);
|
|
134
135
|
rpc.set(plugin_api_rpc_1.PLUGIN_RPC_CONTEXT.COMMENTS_MAIN, commentsMain);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-context.js","sourceRoot":"","sources":["../../../src/main/browser/main-context.ts"],"names":[],"mappings":";;;AAgBA,mEAAkE;AAClE,yEAAwE;AACxE,uDAAsD;AAEtD,gEAAuI;AACvI,mEAAkE;AAClE,2DAAsD;AACtD,qDAAqD;AACrD,yFAAsF;AACtF,yCAAyC;AACzC,6EAAuE;AACvE,mDAA0D;AAC1D,iDAAiD;AACjD,4DAA2D;AAC3D,2DAA2D;AAC3D,wDAAyD;AACzD,mDAAmD;AACnD,6CAA6C;AAC7C,qDAAmD;AACnD,mDAAmD;AACnD,mEAA6D;AAC7D,yCAAyC;AACzC,qEAAqE;AACrE,qDAAqD;AACrD,qDAAqD;AACrD,2DAA0D;AAC1D,uDAA0D;AAC1D,2EAAiE;AACjE,2EAAuE;AACvE,uFAAmF;AACnF,iGAA2F;AAC3F,2FAAsF;AACtF,qFAA8E;AAC9E,6DAA4D;AAC5D,mDAAmD;AACnD,+DAA+D;AAC/D,iDAAiD;AACjD,4DAA2D;AAC3D,8EAA6E;AAC7E,iDAAiD;AACjD,2EAA0E;AAC1E,iFAA6E;AAC7E,4DAAgE;AAChE,8DAA2E;
|
|
1
|
+
{"version":3,"file":"main-context.js","sourceRoot":"","sources":["../../../src/main/browser/main-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
2
|
+
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
2
3
|
import { Theme } from '@theia/core/lib/common/theme';
|
|
3
4
|
import { IconUrl } from '../../common/plugin-protocol';
|
|
4
5
|
import { Reference } from '@theia/core/lib/common/reference';
|
|
@@ -10,12 +11,13 @@ export interface PluginIcon extends Disposable {
|
|
|
10
11
|
readonly iconClass: string;
|
|
11
12
|
}
|
|
12
13
|
export declare class PluginSharedStyle {
|
|
14
|
+
protected readonly themeService: ThemeService;
|
|
13
15
|
protected style: HTMLStyleElement;
|
|
14
16
|
protected readonly rules: {
|
|
15
17
|
selector: string;
|
|
16
18
|
body: (theme: Theme) => string;
|
|
17
19
|
}[];
|
|
18
|
-
|
|
20
|
+
protected init(): void;
|
|
19
21
|
protected readonly toUpdate: DisposableCollection;
|
|
20
22
|
protected update(): void;
|
|
21
23
|
insertRule(selector: string, body: (theme: Theme) => string): Disposable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-shared-style.d.ts","sourceRoot":"","sources":["../../../src/main/browser/plugin-shared-style.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-shared-style.d.ts","sourceRoot":"","sources":["../../../src/main/browser/plugin-shared-style.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,SAAS,EAA2B,MAAM,kCAAkC,CAAC;AAGtF,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,OAAO,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC7B;AAED,qBACa,iBAAiB;IAEJ,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE;QACtB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAA;KACjC,EAAE,CAAM;IAGT,SAAS,CAAC,IAAI,IAAI,IAAI;IAKtB,SAAS,CAAC,QAAQ,CAAC,QAAQ,uBAA8B;IACzD,SAAS,CAAC,MAAM,IAAI,IAAI;IAgBxB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,GAAG,UAAU;IAYxE,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACvC,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAA;KACjC,GAAG,IAAI;IAKR,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAYlC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA6F;IACnH,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAiB,GAAG,SAAS,CAAC,UAAU,CAAC;IAI3F,OAAO,CAAC,YAAY,CAAK;IACzB,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,UAAU;IAqB1D,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAOpD"}
|
|
@@ -37,8 +37,10 @@ let PluginSharedStyle = PluginSharedStyle_1 = class PluginSharedStyle {
|
|
|
37
37
|
this.toUpdate = new disposable_1.DisposableCollection();
|
|
38
38
|
this.icons = new reference_1.SyncReferenceCollection(key => this.createPluginIcon(key));
|
|
39
39
|
this.iconSequence = 0;
|
|
40
|
+
}
|
|
41
|
+
init() {
|
|
40
42
|
this.update();
|
|
41
|
-
|
|
43
|
+
this.themeService.onDidColorThemeChange(() => this.update());
|
|
42
44
|
}
|
|
43
45
|
update() {
|
|
44
46
|
this.toUpdate.dispose();
|
|
@@ -65,7 +67,7 @@ let PluginSharedStyle = PluginSharedStyle_1 = class PluginSharedStyle {
|
|
|
65
67
|
}
|
|
66
68
|
doInsertRule({ selector, body }) {
|
|
67
69
|
const sheet = this.style.sheet;
|
|
68
|
-
const cssBody = body(
|
|
70
|
+
const cssBody = body(this.themeService.getCurrentTheme());
|
|
69
71
|
sheet.insertRule(selector + ' {\n' + cssBody + '\n}', 0);
|
|
70
72
|
}
|
|
71
73
|
deleteRule(selector) {
|
|
@@ -109,9 +111,18 @@ let PluginSharedStyle = PluginSharedStyle_1 = class PluginSharedStyle {
|
|
|
109
111
|
return iconUrl;
|
|
110
112
|
}
|
|
111
113
|
};
|
|
114
|
+
__decorate([
|
|
115
|
+
(0, inversify_1.inject)(theming_1.ThemeService),
|
|
116
|
+
__metadata("design:type", theming_1.ThemeService)
|
|
117
|
+
], PluginSharedStyle.prototype, "themeService", void 0);
|
|
118
|
+
__decorate([
|
|
119
|
+
(0, inversify_1.postConstruct)(),
|
|
120
|
+
__metadata("design:type", Function),
|
|
121
|
+
__metadata("design:paramtypes", []),
|
|
122
|
+
__metadata("design:returntype", void 0)
|
|
123
|
+
], PluginSharedStyle.prototype, "init", null);
|
|
112
124
|
PluginSharedStyle = PluginSharedStyle_1 = __decorate([
|
|
113
|
-
(0, inversify_1.injectable)()
|
|
114
|
-
__metadata("design:paramtypes", [])
|
|
125
|
+
(0, inversify_1.injectable)()
|
|
115
126
|
], PluginSharedStyle);
|
|
116
127
|
exports.PluginSharedStyle = PluginSharedStyle;
|
|
117
128
|
//# sourceMappingURL=plugin-shared-style.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-shared-style.js","sourceRoot":"","sources":["../../../src/main/browser/plugin-shared-style.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"plugin-shared-style.js","sourceRoot":"","sources":["../../../src/main/browser/plugin-shared-style.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ThemingMain } from '../../common/plugin-api-rpc';
|
|
2
2
|
import { RPCProtocol } from '../../common/rpc-protocol';
|
|
3
|
+
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
3
4
|
export declare class ThemingMainImpl implements ThemingMain {
|
|
4
5
|
private readonly proxy;
|
|
5
6
|
private readonly themeChangeListener;
|
|
6
|
-
constructor(rpc: RPCProtocol);
|
|
7
|
+
constructor(rpc: RPCProtocol, themeService: ThemeService);
|
|
7
8
|
dispose(): void;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=theming-main.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theming-main.d.ts","sourceRoot":"","sources":["../../../src/main/browser/theming-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAoB,WAAW,EAAc,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"theming-main.d.ts","sourceRoot":"","sources":["../../../src/main/browser/theming-main.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAoB,WAAW,EAAc,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAS/D,qBAAa,eAAgB,YAAW,WAAW;IAE/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAa;gBAErC,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY;IAMxD,OAAO,IAAI,IAAI;CAGlB"}
|
|
@@ -17,19 +17,16 @@
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.ThemingMainImpl = void 0;
|
|
19
19
|
const plugin_api_rpc_1 = require("../../common/plugin-api-rpc");
|
|
20
|
-
const theming_1 = require("@theia/core/lib/browser/theming");
|
|
21
20
|
/*---------------------------------------------------------------------------------------------
|
|
22
21
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
23
22
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
24
23
|
*--------------------------------------------------------------------------------------------*/
|
|
25
24
|
// some code copied and modified from https://github.com/microsoft/vscode/blob/bafca191f55a234fad20ab67bb689aacc80e7a1a/src/vs/workbench/api/browser/mainThreadTheming.ts
|
|
26
25
|
class ThemingMainImpl {
|
|
27
|
-
constructor(rpc) {
|
|
26
|
+
constructor(rpc, themeService) {
|
|
28
27
|
this.proxy = rpc.getProxy(plugin_api_rpc_1.MAIN_RPC_CONTEXT.THEMING_EXT);
|
|
29
|
-
this.themeChangeListener =
|
|
30
|
-
|
|
31
|
-
});
|
|
32
|
-
this.proxy.$onColorThemeChange(theming_1.ThemeService.get().getCurrentTheme().type);
|
|
28
|
+
this.themeChangeListener = themeService.onDidColorThemeChange(e => this.proxy.$onColorThemeChange(e.newTheme.type));
|
|
29
|
+
this.proxy.$onColorThemeChange(themeService.getCurrentTheme().type);
|
|
33
30
|
}
|
|
34
31
|
dispose() {
|
|
35
32
|
this.themeChangeListener.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theming-main.js","sourceRoot":"","sources":["../../../src/main/browser/theming-main.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,gEAAwF;
|
|
1
|
+
{"version":3,"file":"theming-main.js","sourceRoot":"","sources":["../../../src/main/browser/theming-main.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,gEAAwF;AAKxF;;;gGAGgG;AAChG,yKAAyK;AAEzK,MAAa,eAAe;IAKxB,YAAY,GAAgB,EAAE,YAA0B;QACpD,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,iCAAgB,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,CAAC,mBAAmB,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACpH,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,OAAO;QACH,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;CACJ;AAdD,0CAcC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Emitter } from '@theia/core/lib/common/event';
|
|
2
2
|
import { EditorPreferences, EditorConfiguration } from '@theia/editor/lib/browser/editor-preferences';
|
|
3
|
+
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
3
4
|
import { Theme } from '@theia/core/lib/common/theme';
|
|
4
5
|
import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
|
|
5
6
|
import { ColorApplicationContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
@@ -17,6 +18,7 @@ export declare class WebviewThemeDataProvider {
|
|
|
17
18
|
protected readonly editorPreferences: EditorPreferences;
|
|
18
19
|
protected readonly colors: ColorRegistry;
|
|
19
20
|
protected readonly colorContribution: ColorApplicationContribution;
|
|
21
|
+
protected readonly themeService: ThemeService;
|
|
20
22
|
protected themeData: WebviewThemeData | undefined;
|
|
21
23
|
protected readonly editorStyles: Map<keyof EditorConfiguration, string>;
|
|
22
24
|
protected init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webview-theme-data-provider.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-theme-data-provider.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"webview-theme-data-provider.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-theme-data-provider.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACtG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wDAAwD,CAAC;AAEtG,oBAAY,gBAAgB,GAAG,cAAc,GAAG,aAAa,GAAG,sBAAsB,CAAC;AACvF,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAC3C,QAAQ,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;CACjE;AAED,qBACa,wBAAwB;IAEjC,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,QAAQ,CAAC,oBAAoB,qDAA0C;IAE5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,4BAA4B,CAAC;IACnF,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,YAAY,yCAI5B;IAGH,SAAS,CAAC,IAAI,IAAI,IAAI;IAUtB,SAAS,CAAC,KAAK,IAAI,IAAI;IAOvB,YAAY,IAAI,gBAAgB;IAOhC,SAAS,CAAC,gBAAgB,IAAI,gBAAgB;IA+B9C,SAAS,CAAC,cAAc,IAAI,KAAK;IAIjC,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,gBAAgB;CAQzD"}
|
|
@@ -94,7 +94,7 @@ let WebviewThemeDataProvider = class WebviewThemeDataProvider {
|
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
96
|
getActiveTheme() {
|
|
97
|
-
return
|
|
97
|
+
return this.themeService.getCurrentTheme();
|
|
98
98
|
}
|
|
99
99
|
getThemeType(theme) {
|
|
100
100
|
switch (theme.type) {
|
|
@@ -116,6 +116,10 @@ __decorate([
|
|
|
116
116
|
(0, inversify_1.inject)(color_application_contribution_1.ColorApplicationContribution),
|
|
117
117
|
__metadata("design:type", color_application_contribution_1.ColorApplicationContribution)
|
|
118
118
|
], WebviewThemeDataProvider.prototype, "colorContribution", void 0);
|
|
119
|
+
__decorate([
|
|
120
|
+
(0, inversify_1.inject)(theming_1.ThemeService),
|
|
121
|
+
__metadata("design:type", theming_1.ThemeService)
|
|
122
|
+
], WebviewThemeDataProvider.prototype, "themeService", void 0);
|
|
119
123
|
__decorate([
|
|
120
124
|
(0, inversify_1.postConstruct)(),
|
|
121
125
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webview-theme-data-provider.js","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-theme-data-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;AAChF;;;gGAGgG;AAChG,iKAAiK;;;;;;;;;;;;AAEjK,4DAAiF;AACjF,wDAAuD;AACvD,qFAAsG;AACtG,6DAA+D;AAE/D,2EAAuE;AACvE,2GAAsG;AAUtG,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAArC;QAEuB,gCAA2B,GAAG,IAAI,eAAO,EAAQ,CAAC;QAC5D,yBAAoB,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"webview-theme-data-provider.js","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-theme-data-provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/plugin-ext",
|
|
3
|
-
"version": "1.27.0-next.
|
|
3
|
+
"version": "1.27.0-next.39+bf905e82c16",
|
|
4
4
|
"description": "Theia - Plugin Extension",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@theia/bulk-edit": "1.27.0-next.
|
|
9
|
-
"@theia/callhierarchy": "1.27.0-next.
|
|
10
|
-
"@theia/console": "1.27.0-next.
|
|
11
|
-
"@theia/core": "1.27.0-next.
|
|
12
|
-
"@theia/debug": "1.27.0-next.
|
|
13
|
-
"@theia/editor": "1.27.0-next.
|
|
14
|
-
"@theia/file-search": "1.27.0-next.
|
|
15
|
-
"@theia/filesystem": "1.27.0-next.
|
|
16
|
-
"@theia/markers": "1.27.0-next.
|
|
17
|
-
"@theia/messages": "1.27.0-next.
|
|
18
|
-
"@theia/monaco": "1.27.0-next.
|
|
8
|
+
"@theia/bulk-edit": "1.27.0-next.39+bf905e82c16",
|
|
9
|
+
"@theia/callhierarchy": "1.27.0-next.39+bf905e82c16",
|
|
10
|
+
"@theia/console": "1.27.0-next.39+bf905e82c16",
|
|
11
|
+
"@theia/core": "1.27.0-next.39+bf905e82c16",
|
|
12
|
+
"@theia/debug": "1.27.0-next.39+bf905e82c16",
|
|
13
|
+
"@theia/editor": "1.27.0-next.39+bf905e82c16",
|
|
14
|
+
"@theia/file-search": "1.27.0-next.39+bf905e82c16",
|
|
15
|
+
"@theia/filesystem": "1.27.0-next.39+bf905e82c16",
|
|
16
|
+
"@theia/markers": "1.27.0-next.39+bf905e82c16",
|
|
17
|
+
"@theia/messages": "1.27.0-next.39+bf905e82c16",
|
|
18
|
+
"@theia/monaco": "1.27.0-next.39+bf905e82c16",
|
|
19
19
|
"@theia/monaco-editor-core": "1.65.2",
|
|
20
|
-
"@theia/navigator": "1.27.0-next.
|
|
21
|
-
"@theia/output": "1.27.0-next.
|
|
22
|
-
"@theia/plugin": "1.27.0-next.
|
|
23
|
-
"@theia/preferences": "1.27.0-next.
|
|
24
|
-
"@theia/scm": "1.27.0-next.
|
|
25
|
-
"@theia/search-in-workspace": "1.27.0-next.
|
|
26
|
-
"@theia/task": "1.27.0-next.
|
|
27
|
-
"@theia/terminal": "1.27.0-next.
|
|
28
|
-
"@theia/timeline": "1.27.0-next.
|
|
29
|
-
"@theia/variable-resolver": "1.27.0-next.
|
|
30
|
-
"@theia/workspace": "1.27.0-next.
|
|
20
|
+
"@theia/navigator": "1.27.0-next.39+bf905e82c16",
|
|
21
|
+
"@theia/output": "1.27.0-next.39+bf905e82c16",
|
|
22
|
+
"@theia/plugin": "1.27.0-next.39+bf905e82c16",
|
|
23
|
+
"@theia/preferences": "1.27.0-next.39+bf905e82c16",
|
|
24
|
+
"@theia/scm": "1.27.0-next.39+bf905e82c16",
|
|
25
|
+
"@theia/search-in-workspace": "1.27.0-next.39+bf905e82c16",
|
|
26
|
+
"@theia/task": "1.27.0-next.39+bf905e82c16",
|
|
27
|
+
"@theia/terminal": "1.27.0-next.39+bf905e82c16",
|
|
28
|
+
"@theia/timeline": "1.27.0-next.39+bf905e82c16",
|
|
29
|
+
"@theia/variable-resolver": "1.27.0-next.39+bf905e82c16",
|
|
30
|
+
"@theia/workspace": "1.27.0-next.39+bf905e82c16",
|
|
31
31
|
"@types/mime": "^2.0.1",
|
|
32
32
|
"decompress": "^4.2.1",
|
|
33
33
|
"escape-html": "^1.0.3",
|
|
@@ -93,5 +93,5 @@
|
|
|
93
93
|
"nyc": {
|
|
94
94
|
"extends": "../../configs/nyc.json"
|
|
95
95
|
},
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "bf905e82c169eefd5ff6439804a5718687c0ef0a"
|
|
97
97
|
}
|
|
@@ -58,6 +58,7 @@ import { WebviewViewsMainImpl } from './webview-views/webview-views-main';
|
|
|
58
58
|
import { MonacoLanguages } from '@theia/monaco/lib/browser/monaco-languages';
|
|
59
59
|
import { NotificationExtImpl } from '../../plugin/notification';
|
|
60
60
|
import { UntitledResourceResolver } from '@theia/core/lib/common/resource';
|
|
61
|
+
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
61
62
|
|
|
62
63
|
export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container): void {
|
|
63
64
|
const authenticationMain = new AuthenticationMainImpl(rpc, container);
|
|
@@ -178,7 +179,7 @@ export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container
|
|
|
178
179
|
const timelineMain = new TimelineMainImpl(rpc, container);
|
|
179
180
|
rpc.set(PLUGIN_RPC_CONTEXT.TIMELINE_MAIN, timelineMain);
|
|
180
181
|
|
|
181
|
-
const themingMain = new ThemingMainImpl(rpc);
|
|
182
|
+
const themingMain = new ThemingMainImpl(rpc, container.get(ThemeService));
|
|
182
183
|
rpc.set(PLUGIN_RPC_CONTEXT.THEMING_MAIN, themingMain);
|
|
183
184
|
|
|
184
185
|
const commentsMain = new CommentsMainImp(rpc, container);
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
19
|
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
20
20
|
import { Theme } from '@theia/core/lib/common/theme';
|
|
@@ -34,15 +34,18 @@ export interface PluginIcon extends Disposable {
|
|
|
34
34
|
@injectable()
|
|
35
35
|
export class PluginSharedStyle {
|
|
36
36
|
|
|
37
|
+
@inject(ThemeService) protected readonly themeService: ThemeService;
|
|
38
|
+
|
|
37
39
|
protected style: HTMLStyleElement;
|
|
38
40
|
protected readonly rules: {
|
|
39
41
|
selector: string;
|
|
40
42
|
body: (theme: Theme) => string
|
|
41
43
|
}[] = [];
|
|
42
44
|
|
|
43
|
-
|
|
45
|
+
@postConstruct()
|
|
46
|
+
protected init(): void {
|
|
44
47
|
this.update();
|
|
45
|
-
|
|
48
|
+
this.themeService.onDidColorThemeChange(() => this.update());
|
|
46
49
|
}
|
|
47
50
|
|
|
48
51
|
protected readonly toUpdate = new DisposableCollection();
|
|
@@ -79,7 +82,7 @@ export class PluginSharedStyle {
|
|
|
79
82
|
body: (theme: Theme) => string
|
|
80
83
|
}): void {
|
|
81
84
|
const sheet = (<CSSStyleSheet>this.style.sheet);
|
|
82
|
-
const cssBody = body(
|
|
85
|
+
const cssBody = body(this.themeService.getCurrentTheme());
|
|
83
86
|
sheet.insertRule(selector + ' {\n' + cssBody + '\n}', 0);
|
|
84
87
|
}
|
|
85
88
|
deleteRule(selector: string): void {
|
|
@@ -30,14 +30,10 @@ export class ThemingMainImpl implements ThemingMain {
|
|
|
30
30
|
private readonly proxy: ThemingExt;
|
|
31
31
|
private readonly themeChangeListener: Disposable;
|
|
32
32
|
|
|
33
|
-
constructor(
|
|
34
|
-
rpc: RPCProtocol
|
|
35
|
-
) {
|
|
33
|
+
constructor(rpc: RPCProtocol, themeService: ThemeService) {
|
|
36
34
|
this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.THEMING_EXT);
|
|
37
|
-
this.themeChangeListener =
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
this.proxy.$onColorThemeChange(ThemeService.get().getCurrentTheme().type);
|
|
35
|
+
this.themeChangeListener = themeService.onDidColorThemeChange(e => this.proxy.$onColorThemeChange(e.newTheme.type));
|
|
36
|
+
this.proxy.$onColorThemeChange(themeService.getCurrentTheme().type);
|
|
41
37
|
}
|
|
42
38
|
|
|
43
39
|
dispose(): void {
|
|
@@ -40,14 +40,10 @@ export class WebviewThemeDataProvider {
|
|
|
40
40
|
protected readonly onDidChangeThemeDataEmitter = new Emitter<void>();
|
|
41
41
|
readonly onDidChangeThemeData = this.onDidChangeThemeDataEmitter.event;
|
|
42
42
|
|
|
43
|
-
@inject(EditorPreferences)
|
|
44
|
-
protected readonly
|
|
45
|
-
|
|
46
|
-
@inject(
|
|
47
|
-
protected readonly colors: ColorRegistry;
|
|
48
|
-
|
|
49
|
-
@inject(ColorApplicationContribution)
|
|
50
|
-
protected readonly colorContribution: ColorApplicationContribution;
|
|
43
|
+
@inject(EditorPreferences) protected readonly editorPreferences: EditorPreferences;
|
|
44
|
+
@inject(ColorRegistry) protected readonly colors: ColorRegistry;
|
|
45
|
+
@inject(ColorApplicationContribution) protected readonly colorContribution: ColorApplicationContribution;
|
|
46
|
+
@inject(ThemeService) protected readonly themeService: ThemeService;
|
|
51
47
|
|
|
52
48
|
protected themeData: WebviewThemeData | undefined;
|
|
53
49
|
|
|
@@ -114,7 +110,7 @@ export class WebviewThemeDataProvider {
|
|
|
114
110
|
}
|
|
115
111
|
|
|
116
112
|
protected getActiveTheme(): Theme {
|
|
117
|
-
return
|
|
113
|
+
return this.themeService.getCurrentTheme();
|
|
118
114
|
}
|
|
119
115
|
|
|
120
116
|
protected getThemeType(theme: Theme): WebviewThemeType {
|