@theia/monaco 1.13.0-next.df062f62 → 1.13.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/lib/browser/monaco-indexed-db.d.ts +7 -0
- package/lib/browser/monaco-indexed-db.d.ts.map +1 -1
- package/lib/browser/monaco-indexed-db.js +112 -1
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-theming-service.d.ts.map +1 -1
- package/lib/browser/monaco-theming-service.js +1 -16
- package/lib/browser/monaco-theming-service.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/monaco-indexed-db.ts +50 -0
- package/src/browser/monaco-theming-service.ts +3 -18
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
/// <reference types="@theia/monaco-editor-core/monaco" />
|
|
17
17
|
import * as idb from 'idb';
|
|
18
18
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
19
|
+
import { Theme, ThemeService } from '@theia/core/lib/browser/theming';
|
|
19
20
|
declare type ThemeMix = import('./textmate/monaco-theme-registry').ThemeMix;
|
|
20
21
|
export declare const monacoDB: Promise<idb.IDBPDatabase<unknown>> | undefined;
|
|
21
22
|
export interface MonacoThemeState {
|
|
@@ -31,5 +32,11 @@ export declare namespace MonacoThemeState {
|
|
|
31
32
|
export declare function getThemes(): Promise<MonacoThemeState[]>;
|
|
32
33
|
export declare function putTheme(state: MonacoThemeState): Disposable;
|
|
33
34
|
export declare function deleteTheme(id: string): Promise<void>;
|
|
35
|
+
export declare function stateToTheme(state: MonacoThemeState): Theme;
|
|
36
|
+
export declare class ThemeServiceWithDB extends ThemeService {
|
|
37
|
+
static get(): ThemeService;
|
|
38
|
+
loadUserTheme(): void;
|
|
39
|
+
protected loadUserThemeWithDB(): Promise<void>;
|
|
40
|
+
}
|
|
34
41
|
export {};
|
|
35
42
|
//# sourceMappingURL=monaco-indexed-db.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-indexed-db.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,aAAK,QAAQ,GAAG,OAAO,kCAAkC,EAAE,QAAQ,CAAC;AAapE,eAAO,MAAM,QAAQ,gDAAY,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAA;IACnC,IAAI,EAAE,QAAQ,CAAA;CACjB;AACD,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,gBAAgB,CAEvE;CACJ;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAO7D;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU,CAI5D;AAkBD,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3D"}
|
|
1
|
+
{"version":3,"file":"monaco-indexed-db.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAwB,KAAK,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAC;AAChH,aAAK,QAAQ,GAAG,OAAO,kCAAkC,EAAE,QAAQ,CAAC;AAapE,eAAO,MAAM,QAAQ,gDAAY,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAA;IACnC,IAAI,EAAE,QAAQ,CAAA;CACjB;AACD,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,gBAAgB,CAEvE;CACJ;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAO7D;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU,CAI5D;AAkBD,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,KAAK,CAiB3D;AAOD,qBAAa,kBAAmB,SAAQ,YAAY;IAChD,MAAM,CAAC,GAAG,IAAI,YAAY;IAW1B,aAAa,IAAI,IAAI;cAIL,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAKvD"}
|
|
@@ -14,6 +14,19 @@
|
|
|
14
14
|
*
|
|
15
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
********************************************************************************/
|
|
17
|
+
var __extends = (this && this.__extends) || (function () {
|
|
18
|
+
var extendStatics = function (d, b) {
|
|
19
|
+
extendStatics = Object.setPrototypeOf ||
|
|
20
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
21
|
+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
22
|
+
return extendStatics(d, b);
|
|
23
|
+
};
|
|
24
|
+
return function (d, b) {
|
|
25
|
+
extendStatics(d, b);
|
|
26
|
+
function __() { this.constructor = d; }
|
|
27
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
28
|
+
};
|
|
29
|
+
})();
|
|
17
30
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
18
31
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
19
32
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -50,10 +63,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
50
63
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
51
64
|
}
|
|
52
65
|
};
|
|
66
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
67
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
68
|
+
if (!m) return o;
|
|
69
|
+
var i = m.call(o), r, ar = [], e;
|
|
70
|
+
try {
|
|
71
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
72
|
+
}
|
|
73
|
+
catch (error) { e = { error: error }; }
|
|
74
|
+
finally {
|
|
75
|
+
try {
|
|
76
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
77
|
+
}
|
|
78
|
+
finally { if (e) throw e.error; }
|
|
79
|
+
}
|
|
80
|
+
return ar;
|
|
81
|
+
};
|
|
82
|
+
var __spread = (this && this.__spread) || function () {
|
|
83
|
+
for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
|
|
84
|
+
return ar;
|
|
85
|
+
};
|
|
53
86
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
54
|
-
exports.deleteTheme = exports.putTheme = exports.getThemes = exports.MonacoThemeState = exports.monacoDB = void 0;
|
|
87
|
+
exports.ThemeServiceWithDB = exports.stateToTheme = exports.deleteTheme = exports.putTheme = exports.getThemes = exports.MonacoThemeState = exports.monacoDB = void 0;
|
|
55
88
|
var idb = require("idb");
|
|
56
89
|
var disposable_1 = require("@theia/core/lib/common/disposable");
|
|
90
|
+
var theming_1 = require("@theia/core/lib/browser/theming");
|
|
57
91
|
var _monacoDB;
|
|
58
92
|
if ('indexedDB' in window) {
|
|
59
93
|
_monacoDB = idb.openDB('theia-monaco', 1, {
|
|
@@ -151,4 +185,81 @@ function deleteTheme(id) {
|
|
|
151
185
|
});
|
|
152
186
|
}
|
|
153
187
|
exports.deleteTheme = deleteTheme;
|
|
188
|
+
function stateToTheme(state) {
|
|
189
|
+
var id = state.id, label = state.label, description = state.description, uiTheme = state.uiTheme, data = state.data;
|
|
190
|
+
var type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
191
|
+
var builtInTheme = uiTheme === 'vs' ? theming_1.BuiltinThemeProvider.lightCss : theming_1.BuiltinThemeProvider.darkCss;
|
|
192
|
+
return {
|
|
193
|
+
type: type,
|
|
194
|
+
id: id,
|
|
195
|
+
label: label,
|
|
196
|
+
description: description,
|
|
197
|
+
editorTheme: data.name,
|
|
198
|
+
activate: function () {
|
|
199
|
+
builtInTheme.use();
|
|
200
|
+
},
|
|
201
|
+
deactivate: function () {
|
|
202
|
+
builtInTheme.unuse();
|
|
203
|
+
}
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
exports.stateToTheme = stateToTheme;
|
|
207
|
+
function getThemeFromDB(id) {
|
|
208
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
209
|
+
var matchingState;
|
|
210
|
+
return __generator(this, function (_a) {
|
|
211
|
+
switch (_a.label) {
|
|
212
|
+
case 0: return [4 /*yield*/, getThemes()];
|
|
213
|
+
case 1:
|
|
214
|
+
matchingState = (_a.sent()).find(function (theme) { return theme.id === id; });
|
|
215
|
+
return [2 /*return*/, matchingState && stateToTheme(matchingState)];
|
|
216
|
+
}
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
var ThemeServiceWithDB = /** @class */ (function (_super) {
|
|
221
|
+
__extends(ThemeServiceWithDB, _super);
|
|
222
|
+
function ThemeServiceWithDB() {
|
|
223
|
+
return _super !== null && _super.apply(this, arguments) || this;
|
|
224
|
+
}
|
|
225
|
+
ThemeServiceWithDB.get = function () {
|
|
226
|
+
var global = window; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
227
|
+
if (!global[theming_1.ThemeServiceSymbol]) {
|
|
228
|
+
var themeService = new ThemeServiceWithDB();
|
|
229
|
+
themeService.register.apply(themeService, __spread(theming_1.BuiltinThemeProvider.themes));
|
|
230
|
+
themeService.startupTheme();
|
|
231
|
+
global[theming_1.ThemeServiceSymbol] = themeService;
|
|
232
|
+
}
|
|
233
|
+
return global[theming_1.ThemeServiceSymbol];
|
|
234
|
+
};
|
|
235
|
+
ThemeServiceWithDB.prototype.loadUserTheme = function () {
|
|
236
|
+
this.loadUserThemeWithDB();
|
|
237
|
+
};
|
|
238
|
+
ThemeServiceWithDB.prototype.loadUserThemeWithDB = function () {
|
|
239
|
+
var _a, _b;
|
|
240
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
241
|
+
var themeId, theme, _c;
|
|
242
|
+
return __generator(this, function (_d) {
|
|
243
|
+
switch (_d.label) {
|
|
244
|
+
case 0:
|
|
245
|
+
themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
|
|
246
|
+
if (!((_a = this.themes[themeId]) !== null && _a !== void 0)) return [3 /*break*/, 1];
|
|
247
|
+
_c = _a;
|
|
248
|
+
return [3 /*break*/, 3];
|
|
249
|
+
case 1: return [4 /*yield*/, getThemeFromDB(themeId)];
|
|
250
|
+
case 2:
|
|
251
|
+
_c = _d.sent();
|
|
252
|
+
_d.label = 3;
|
|
253
|
+
case 3:
|
|
254
|
+
theme = (_b = _c) !== null && _b !== void 0 ? _b : this.defaultTheme;
|
|
255
|
+
this.setCurrentTheme(theme.id);
|
|
256
|
+
return [2 /*return*/];
|
|
257
|
+
}
|
|
258
|
+
});
|
|
259
|
+
});
|
|
260
|
+
};
|
|
261
|
+
return ThemeServiceWithDB;
|
|
262
|
+
}(theming_1.ThemeService));
|
|
263
|
+
exports.ThemeServiceWithDB = ThemeServiceWithDB;
|
|
264
|
+
theming_1.ThemeService.get = ThemeServiceWithDB.get;
|
|
154
265
|
//# sourceMappingURL=monaco-indexed-db.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-indexed-db.js","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF
|
|
1
|
+
{"version":3,"file":"monaco-indexed-db.js","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAQlF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErF,OAAO,EAAuB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAQlF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErF,OAAO,EAAuB,gBAAgB,EAAgB,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE,MAAM,WAAW,WAAW;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,GAAG,CAAA;IACT;;OAEG;IACH,QAAQ,CAAC,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;CAC5C;AAED,qBACa,oBAAoB;IAG7B,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAO,GAAG,UAAU;cAMvE,UAAU,CAAC,KAAK,EAAE,WAAW,EACzC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,IAAI,CAAC;cAeA,SAAS,CACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EACpC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,GAAG,CAAC;IAgCf,SAAS,CAAC,WAAW,CACjB,QAAQ,EAAE,GAAG,EACb,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EACpC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,GAAG,CAAC;IAQf,MAAM,CAAC,IAAI,IAAI,IAAI;IAMnB,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU;IASnD,SAAS,CAAC,MAAM,CAAC,eAAe,uBAA8B;IAC9D,SAAS,CAAC,MAAM,CAAC,iBAAiB,IAAI,IAAI;IAQ1C,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU;qBAOzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa/C,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQnD,OAAO,CAAC,UAAU;CAQrB"}
|
|
@@ -196,22 +196,7 @@ var MonacoThemingService = /** @class */ (function () {
|
|
|
196
196
|
this.toUpdateUiTheme.push(disposable_1.Disposable.create(function () { return document.body.classList.remove(uiTheme); }));
|
|
197
197
|
};
|
|
198
198
|
MonacoThemingService.doRegister = function (state) {
|
|
199
|
-
|
|
200
|
-
var type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
201
|
-
var builtInTheme = uiTheme === 'vs' ? theming_1.BuiltinThemeProvider.lightCss : theming_1.BuiltinThemeProvider.darkCss;
|
|
202
|
-
return new disposable_1.DisposableCollection(theming_1.ThemeService.get().register({
|
|
203
|
-
type: type,
|
|
204
|
-
id: id,
|
|
205
|
-
label: label,
|
|
206
|
-
description: description,
|
|
207
|
-
editorTheme: data.name,
|
|
208
|
-
activate: function () {
|
|
209
|
-
builtInTheme.use();
|
|
210
|
-
},
|
|
211
|
-
deactivate: function () {
|
|
212
|
-
builtInTheme.unuse();
|
|
213
|
-
}
|
|
214
|
-
}), monaco_indexed_db_1.putTheme(state));
|
|
199
|
+
return new disposable_1.DisposableCollection(theming_1.ThemeService.get().register(monaco_indexed_db_1.stateToTheme(state)), monaco_indexed_db_1.putTheme(state));
|
|
215
200
|
};
|
|
216
201
|
MonacoThemingService.restore = function () {
|
|
217
202
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theming-service.js","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElF,uDAAuD;AAEvD,0DAAkE;AAClE,0CAA4C;AAC5C,wCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"monaco-theming-service.js","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.13.0
|
|
3
|
+
"version": "1.13.0",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.13.0
|
|
7
|
-
"@theia/editor": "1.13.0
|
|
8
|
-
"@theia/filesystem": "1.13.0
|
|
9
|
-
"@theia/markers": "1.13.0
|
|
6
|
+
"@theia/core": "1.13.0",
|
|
7
|
+
"@theia/editor": "1.13.0",
|
|
8
|
+
"@theia/filesystem": "1.13.0",
|
|
9
|
+
"@theia/markers": "1.13.0",
|
|
10
10
|
"@theia/monaco-editor-core": "^0.20.0",
|
|
11
|
-
"@theia/outline-view": "1.13.0
|
|
12
|
-
"@theia/workspace": "1.13.0
|
|
11
|
+
"@theia/outline-view": "1.13.0",
|
|
12
|
+
"@theia/workspace": "1.13.0",
|
|
13
13
|
"deepmerge": "2.0.1",
|
|
14
14
|
"fast-plist": "^0.1.2",
|
|
15
15
|
"idb": "^4.0.5",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"test": "theiaext test"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@theia/ext-scripts": "1.13.0
|
|
54
|
+
"@theia/ext-scripts": "1.13.0"
|
|
55
55
|
},
|
|
56
56
|
"nyc": {
|
|
57
57
|
"extends": "../../configs/nyc.json"
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import * as idb from 'idb';
|
|
18
18
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
19
|
+
import { BuiltinThemeProvider, Theme, ThemeService, ThemeServiceSymbol } from '@theia/core/lib/browser/theming';
|
|
19
20
|
type ThemeMix = import('./textmate/monaco-theme-registry').ThemeMix;
|
|
20
21
|
|
|
21
22
|
let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
|
|
@@ -82,3 +83,52 @@ export async function deleteTheme(id: string): Promise<void> {
|
|
|
82
83
|
const db = await monacoDB;
|
|
83
84
|
await db.transaction('themes', 'readwrite').objectStore('themes').delete(id);
|
|
84
85
|
}
|
|
86
|
+
|
|
87
|
+
export function stateToTheme(state: MonacoThemeState): Theme {
|
|
88
|
+
const { id, label, description, uiTheme, data } = state;
|
|
89
|
+
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
90
|
+
const builtInTheme = uiTheme === 'vs' ? BuiltinThemeProvider.lightCss : BuiltinThemeProvider.darkCss;
|
|
91
|
+
return {
|
|
92
|
+
type,
|
|
93
|
+
id,
|
|
94
|
+
label,
|
|
95
|
+
description,
|
|
96
|
+
editorTheme: data.name!,
|
|
97
|
+
activate(): void {
|
|
98
|
+
builtInTheme.use();
|
|
99
|
+
},
|
|
100
|
+
deactivate(): void {
|
|
101
|
+
builtInTheme.unuse();
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
async function getThemeFromDB(id: string): Promise<Theme | undefined> {
|
|
107
|
+
const matchingState = (await getThemes()).find(theme => theme.id === id);
|
|
108
|
+
return matchingState && stateToTheme(matchingState);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
export class ThemeServiceWithDB extends ThemeService {
|
|
112
|
+
static get(): ThemeService {
|
|
113
|
+
const global = window as any; // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
114
|
+
if (!global[ThemeServiceSymbol]) {
|
|
115
|
+
const themeService = new ThemeServiceWithDB();
|
|
116
|
+
themeService.register(...BuiltinThemeProvider.themes);
|
|
117
|
+
themeService.startupTheme();
|
|
118
|
+
global[ThemeServiceSymbol] = themeService;
|
|
119
|
+
}
|
|
120
|
+
return global[ThemeServiceSymbol];
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
loadUserTheme(): void {
|
|
124
|
+
this.loadUserThemeWithDB();
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
protected async loadUserThemeWithDB(): Promise<void> {
|
|
128
|
+
const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
|
|
129
|
+
const theme = this.themes[themeId] ?? await getThemeFromDB(themeId) ?? this.defaultTheme;
|
|
130
|
+
this.setCurrentTheme(theme.id);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
ThemeService.get = ThemeServiceWithDB.get;
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
20
20
|
import * as jsoncparser from 'jsonc-parser';
|
|
21
21
|
import * as plistparser from 'fast-plist';
|
|
22
|
-
import { ThemeService
|
|
22
|
+
import { ThemeService } from '@theia/core/lib/browser/theming';
|
|
23
23
|
import URI from '@theia/core/lib/common/uri';
|
|
24
24
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
25
25
|
import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
|
|
26
|
-
import { getThemes, putTheme, MonacoThemeState } from './monaco-indexed-db';
|
|
26
|
+
import { getThemes, putTheme, MonacoThemeState, stateToTheme } from './monaco-indexed-db';
|
|
27
27
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
28
28
|
|
|
29
29
|
export interface MonacoTheme {
|
|
@@ -161,23 +161,8 @@ export class MonacoThemingService {
|
|
|
161
161
|
}
|
|
162
162
|
|
|
163
163
|
protected static doRegister(state: MonacoThemeState): Disposable {
|
|
164
|
-
const { id, label, description, uiTheme, data } = state;
|
|
165
|
-
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
166
|
-
const builtInTheme = uiTheme === 'vs' ? BuiltinThemeProvider.lightCss : BuiltinThemeProvider.darkCss;
|
|
167
164
|
return new DisposableCollection(
|
|
168
|
-
ThemeService.get().register(
|
|
169
|
-
type,
|
|
170
|
-
id,
|
|
171
|
-
label,
|
|
172
|
-
description: description,
|
|
173
|
-
editorTheme: data.name!,
|
|
174
|
-
activate(): void {
|
|
175
|
-
builtInTheme.use();
|
|
176
|
-
},
|
|
177
|
-
deactivate(): void {
|
|
178
|
-
builtInTheme.unuse();
|
|
179
|
-
}
|
|
180
|
-
}),
|
|
165
|
+
ThemeService.get().register(stateToTheme(state)),
|
|
181
166
|
putTheme(state)
|
|
182
167
|
);
|
|
183
168
|
}
|