@theia/plugin-ext 1.38.0-next.38 → 1.38.0-next.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/lib/common/paths-util.js +2 -2
  2. package/lib/common/paths-util.js.map +1 -1
  3. package/lib/hosted/browser/hosted-plugin.js +1 -1
  4. package/lib/hosted/browser/hosted-plugin.js.map +1 -1
  5. package/lib/hosted/browser/worker/plugin-manifest-loader.js +1 -1
  6. package/lib/hosted/browser/worker/plugin-manifest-loader.js.map +1 -1
  7. package/lib/hosted/node/hosted-plugin-process.js +1 -1
  8. package/lib/hosted/node/hosted-plugin-process.js.map +1 -1
  9. package/lib/hosted/node/plugin-manifest-loader.js +1 -1
  10. package/lib/hosted/node/plugin-manifest-loader.js.map +1 -1
  11. package/lib/main/browser/env-main.js +1 -1
  12. package/lib/main/browser/env-main.js.map +1 -1
  13. package/lib/main/browser/plugin-icon-theme-service.js +1 -1
  14. package/lib/main/browser/plugin-icon-theme-service.js.map +1 -1
  15. package/lib/main/browser/view/plugin-view-registry.js +1 -1
  16. package/lib/main/browser/view/plugin-view-registry.js.map +1 -1
  17. package/lib/main/browser/webview/webview-theme-data-provider.js +2 -2
  18. package/lib/main/browser/webview/webview-theme-data-provider.js.map +1 -1
  19. package/lib/main/browser/webview/webview.js +1 -1
  20. package/lib/main/browser/webview/webview.js.map +1 -1
  21. package/lib/main/node/plugins-key-value-storage.d.ts +18 -5
  22. package/lib/main/node/plugins-key-value-storage.d.ts.map +1 -1
  23. package/lib/main/node/plugins-key-value-storage.js +75 -33
  24. package/lib/main/node/plugins-key-value-storage.js.map +1 -1
  25. package/lib/main/node/plugins-key-value-storage.spec.d.ts +17 -0
  26. package/lib/main/node/plugins-key-value-storage.spec.d.ts.map +1 -0
  27. package/lib/main/node/plugins-key-value-storage.spec.js +97 -0
  28. package/lib/main/node/plugins-key-value-storage.spec.js.map +1 -0
  29. package/lib/plugin/telemetry-ext.js +1 -1
  30. package/lib/plugin/telemetry-ext.js.map +1 -1
  31. package/package.json +26 -26
  32. package/src/common/paths-util.ts +2 -2
  33. package/src/hosted/browser/hosted-plugin.ts +1 -1
  34. package/src/hosted/browser/worker/plugin-manifest-loader.ts +1 -1
  35. package/src/hosted/node/hosted-plugin-process.ts +1 -1
  36. package/src/hosted/node/plugin-manifest-loader.ts +1 -1
  37. package/src/main/browser/env-main.ts +1 -1
  38. package/src/main/browser/plugin-icon-theme-service.ts +1 -1
  39. package/src/main/browser/view/plugin-view-registry.ts +1 -1
  40. package/src/main/browser/webview/pre/main.js +1 -1
  41. package/src/main/browser/webview/webview-theme-data-provider.ts +2 -2
  42. package/src/main/browser/webview/webview.ts +1 -1
  43. package/src/main/node/plugins-key-value-storage.spec.ts +106 -0
  44. package/src/main/node/plugins-key-value-storage.ts +84 -37
  45. package/src/plugin/telemetry-ext.ts +1 -2
package/lib/main/browser/webview/webview.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview.ts"],"names":[],"mappings":"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"}
package/lib/main/node/plugins-key-value-storage.d.ts CHANGED
@@ -1,16 +1,29 @@
1
- import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
2
1
  import { KeysToAnyValues, KeysToKeysToAnyValue } from '../../common/types';
3
2
  import { PluginStorageKind } from '../../common';
3
+ export interface Store {
4
+ fsPath: string;
5
+ values: KeysToKeysToAnyValue;
6
+ }
4
7
  export declare class PluginsKeyValueStorage {
5
- private readonly deferredGlobalDataPath;
6
- private readonly pluginPathsService;
7
- protected readonly envServer: EnvVariablesServer;
8
- protected init(): Promise<void>;
8
+ private stores;
9
+ private storesToSync;
10
+ private syncStoresTimeout?;
11
+ private deferredGlobalDataPath;
12
+ private pluginPathsService;
13
+ private envServer;
14
+ private fsLocking;
15
+ protected init(): void;
9
16
  set(key: string, value: KeysToAnyValues, kind: PluginStorageKind): Promise<boolean>;
10
17
  get(key: string, kind: PluginStorageKind): Promise<KeysToAnyValues>;
11
18
  getAll(kind: PluginStorageKind): Promise<KeysToKeysToAnyValue>;
19
+ private getGlobalDataPath;
20
+ private initializeStore;
21
+ private getStore;
22
+ private syncStores;
23
+ private getSyncStoreTimeout;
12
24
  private getDataPath;
13
25
  private readFromFile;
14
26
  private writeToFile;
27
+ private dispose;
15
28
  }
16
29
  //# sourceMappingURL=plugins-key-value-storage.d.ts.map
package/lib/main/node/plugins-key-value-storage.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugins-key-value-storage.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,qBACa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAsC;IAG7E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;cAGjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB/B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBnF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IASnE,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC;YAQtD,WAAW;YAQX,YAAY;YAYZ,WAAW;CAK5B"}
1
+ {"version":3,"file":"plugins-key-value-storage.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,WAAW,KAAK;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,oBAAoB,CAAA;CAC/B;AAED,qBACa,sBAAsB;IAE/B,OAAO,CAAC,MAAM,CAA8C;IAC5D,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAE3C,OAAO,CAAC,sBAAsB,CAAsC;IAGpE,OAAO,CAAC,kBAAkB,CAAqB;IAG/C,OAAO,CAAC,SAAS,CAAqB;IAGtC,OAAO,CAAC,SAAS,CAAoB;IAGrC,SAAS,CAAC,IAAI,IAAI,IAAI;IAShB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAenF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAKnE,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC;YAKtD,iBAAiB;YAOjB,eAAe;YAUf,QAAQ;IAOtB,OAAO,CAAC,UAAU;IAgBlB,OAAO,CAAC,mBAAmB;YAKb,WAAW;YAUX,YAAY;YAYZ,WAAW;IAKzB,OAAO,CAAC,OAAO;CAIlB"}
package/lib/main/node/plugins-key-value-storage.js CHANGED
@@ -25,7 +25,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
25
25
  };
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.PluginsKeyValueStorage = void 0;
28
+ const application_package_1 = require("@theia/core/shared/@theia/application-package");
28
29
  const inversify_1 = require("@theia/core/shared/inversify");
30
+ const node_1 = require("@theia/core/lib/node");
29
31
  const fs = require("@theia/core/shared/fs-extra");
30
32
  const path = require("path");
31
33
  const file_uri_1 = require("@theia/core/lib/node/file-uri");
@@ -35,61 +37,93 @@ const const_1 = require("./paths/const");
35
37
  const plugin_paths_protocol_1 = require("../common/plugin-paths-protocol");
36
38
  let PluginsKeyValueStorage = class PluginsKeyValueStorage {
37
39
  constructor() {
40
+ this.stores = Object.create(null);
41
+ this.storesToSync = new Set();
38
42
  this.deferredGlobalDataPath = new promise_util_1.Deferred();
39
43
  }
40
- async init() {
41
- try {
42
- const configDirUri = await this.envServer.getConfigDirUri();
43
- const globalStorageFsPath = path.join(file_uri_1.FileUri.fsPath(configDirUri), const_1.PluginPaths.PLUGINS_GLOBAL_STORAGE_DIR);
44
- const exists = await fs.pathExists(globalStorageFsPath);
45
- if (!exists) {
46
- await fs.mkdirs(globalStorageFsPath);
47
- }
48
- const globalDataFsPath = path.join(globalStorageFsPath, 'global-state.json');
49
- this.deferredGlobalDataPath.resolve(globalDataFsPath);
50
- }
51
- catch (e) {
52
- console.error('Failed to initialize global state path: ', e);
53
- this.deferredGlobalDataPath.resolve(undefined);
54
- }
44
+ init() {
45
+ this.deferredGlobalDataPath.resolve(this.getGlobalDataPath().catch(error => {
46
+ console.error('Failed to initialize global state path:', error);
47
+ return undefined;
48
+ }));
49
+ process.once('beforeExit', () => this.dispose());
50
+ this.syncStores();
55
51
  }
56
52
  async set(key, value, kind) {
57
- const dataPath = await this.getDataPath(kind);
58
- if (!dataPath) {
53
+ const store = await this.getStore(kind);
54
+ if (!store) {
59
55
  console.warn('Cannot save data: no opened workspace');
60
56
  return false;
61
57
  }
62
- const data = await this.readFromFile(dataPath);
63
- if (value === undefined) {
64
- delete data[key];
58
+ if (value === undefined || Object.keys(value).length === 0) {
59
+ delete store.values[key];
65
60
  }
66
61
  else {
67
- data[key] = value;
62
+ store.values[key] = value;
68
63
  }
69
- await this.writeToFile(dataPath, data);
64
+ this.storesToSync.add(store);
70
65
  return true;
71
66
  }
72
67
  async get(key, kind) {
73
- const dataPath = await this.getDataPath(kind);
74
- if (!dataPath) {
75
- return {};
76
- }
77
- const data = await this.readFromFile(dataPath);
78
- return data[key];
68
+ var _a;
69
+ const store = await this.getStore(kind);
70
+ return (_a = store === null || store === void 0 ? void 0 : store.values[key]) !== null && _a !== void 0 ? _a : {};
79
71
  }
80
72
  async getAll(kind) {
73
+ var _a;
74
+ const store = await this.getStore(kind);
75
+ return (_a = store === null || store === void 0 ? void 0 : store.values) !== null && _a !== void 0 ? _a : {};
76
+ }
77
+ async getGlobalDataPath() {
78
+ const configDirUri = await this.envServer.getConfigDirUri();
79
+ const globalStorageFsPath = path.join(file_uri_1.FileUri.fsPath(configDirUri), const_1.PluginPaths.PLUGINS_GLOBAL_STORAGE_DIR);
80
+ await fs.ensureDir(globalStorageFsPath);
81
+ return path.join(globalStorageFsPath, 'global-state.json');
82
+ }
83
+ async initializeStore(storePath) {
84
+ return this.fsLocking.lockPath(storePath, async (resolved) => {
85
+ const values = await this.readFromFile(resolved);
86
+ return {
87
+ values,
88
+ fsPath: storePath
89
+ };
90
+ });
91
+ }
92
+ async getStore(kind) {
93
+ var _a;
94
+ var _b;
81
95
  const dataPath = await this.getDataPath(kind);
82
- if (!dataPath) {
83
- return {};
96
+ if (dataPath) {
97
+ return (_a = (_b = this.stores)[dataPath]) !== null && _a !== void 0 ? _a : (_b[dataPath] = await this.initializeStore(dataPath));
84
98
  }
85
- return this.readFromFile(dataPath);
99
+ }
100
+ syncStores() {
101
+ this.syncStoresTimeout = setTimeout(async () => {
102
+ await Promise.all(Array.from(this.storesToSync, async (store) => {
103
+ await this.fsLocking.lockPath(store.fsPath, async (storePath) => {
104
+ const valuesOnDisk = await this.readFromFile(storePath);
105
+ store.values = (0, application_package_1.deepmerge)(valuesOnDisk, store.values);
106
+ await this.writeToFile(storePath, store.values);
107
+ });
108
+ }));
109
+ this.storesToSync.clear();
110
+ if (this.syncStoresTimeout) {
111
+ this.syncStores();
112
+ }
113
+ }, this.getSyncStoreTimeout());
114
+ }
115
+ getSyncStoreTimeout() {
116
+ // 0-10s + 1min
117
+ return 10000 * Math.random() + 60000;
86
118
  }
87
119
  async getDataPath(kind) {
88
120
  if (!kind) {
89
121
  return this.deferredGlobalDataPath.promise;
90
122
  }
91
123
  const storagePath = await this.pluginPathsService.getHostStoragePath(kind.workspace, kind.roots);
92
- return storagePath ? path.join(storagePath, 'workspace-state.json') : undefined;
124
+ if (storagePath) {
125
+ return path.join(storagePath, 'workspace-state.json');
126
+ }
93
127
  }
94
128
  async readFromFile(pathToFile) {
95
129
  if (!await fs.pathExists(pathToFile)) {
@@ -107,6 +141,10 @@ let PluginsKeyValueStorage = class PluginsKeyValueStorage {
107
141
  await fs.ensureDir(path.dirname(pathToFile));
108
142
  await fs.writeJSON(pathToFile, data);
109
143
  }
144
+ dispose() {
145
+ clearTimeout(this.syncStoresTimeout);
146
+ this.syncStoresTimeout = undefined;
147
+ }
110
148
  };
111
149
  __decorate([
112
150
  (0, inversify_1.inject)(plugin_paths_protocol_1.PluginPathsService),
@@ -116,11 +154,15 @@ __decorate([
116
154
  (0, inversify_1.inject)(env_variables_1.EnvVariablesServer),
117
155
  __metadata("design:type", Object)
118
156
  ], PluginsKeyValueStorage.prototype, "envServer", void 0);
157
+ __decorate([
158
+ (0, inversify_1.inject)(node_1.FileSystemLocking),
159
+ __metadata("design:type", Object)
160
+ ], PluginsKeyValueStorage.prototype, "fsLocking", void 0);
119
161
  __decorate([
120
162
  (0, inversify_1.postConstruct)(),
121
163
  __metadata("design:type", Function),
122
164
  __metadata("design:paramtypes", []),
123
- __metadata("design:returntype", Promise)
165
+ __metadata("design:returntype", void 0)
124
166
  ], PluginsKeyValueStorage.prototype, "init", null);
125
167
  PluginsKeyValueStorage = __decorate([
126
168
  (0, inversify_1.injectable)()
package/lib/main/node/plugins-key-value-storage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plugins-key-value-storage.js","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugins-key-value-storage.js","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"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"}
package/lib/main/node/plugins-key-value-storage.spec.d.ts ADDED
@@ -0,0 +1,17 @@
1
+ /********************************************************************************
2
+ * Copyright (C) 2023 Ericsson and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import 'reflect-metadata';
17
+ //# sourceMappingURL=plugins-key-value-storage.spec.d.ts.map
package/lib/main/node/plugins-key-value-storage.spec.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugins-key-value-storage.spec.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,kBAAkB,CAAC"}
package/lib/main/node/plugins-key-value-storage.spec.js ADDED
@@ -0,0 +1,97 @@
1
+ "use strict";
2
+ /********************************************************************************
3
+ * Copyright (C) 2023 Ericsson and others.
4
+ *
5
+ * This program and the accompanying materials are made available under the
6
+ * terms of the Eclipse Public License v. 2.0 which is available at
7
+ * http://www.eclipse.org/legal/epl-2.0.
8
+ *
9
+ * This Source Code may also be made available under the following Secondary
10
+ * Licenses when the conditions for such availability set forth in the Eclipse
11
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ * with the GNU Classpath Exception which is available at
13
+ * https://www.gnu.org/software/classpath/license.html.
14
+ *
15
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
+ ********************************************************************************/
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ require("reflect-metadata");
19
+ const chai_1 = require("chai");
20
+ const inversify_1 = require("@theia/core/shared/inversify");
21
+ const env_variables_1 = require("@theia/core/lib/common/env-variables");
22
+ const plugins_key_value_storage_1 = require("./plugins-key-value-storage");
23
+ const plugin_paths_protocol_1 = require("../common/plugin-paths-protocol");
24
+ const plugin_paths_service_1 = require("./paths/plugin-paths-service");
25
+ const plugin_cli_contribution_1 = require("./plugin-cli-contribution");
26
+ const logger_1 = require("@theia/core/lib/common/logger");
27
+ const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
28
+ const mock_env_variables_server_1 = require("@theia/core/lib/browser/test/mock-env-variables-server");
29
+ const node_1 = require("@theia/core/lib/node");
30
+ const filesystem_locking_1 = require("@theia/core/lib/node/filesystem-locking");
31
+ const temp = require("temp");
32
+ const GlobalStorageKind = undefined;
33
+ describe('Plugins Key Value Storage', () => {
34
+ let container;
35
+ beforeEach(async () => {
36
+ container = new inversify_1.Container();
37
+ container.bind(plugins_key_value_storage_1.PluginsKeyValueStorage).toSelf().inSingletonScope();
38
+ container.bind(plugin_cli_contribution_1.PluginCliContribution).toSelf().inSingletonScope();
39
+ container.bind(node_1.FileSystemLocking).to(filesystem_locking_1.FileSystemLockingImpl).inSingletonScope();
40
+ container.bind(env_variables_1.EnvVariablesServer).toConstantValue(new mock_env_variables_server_1.MockEnvVariablesServerImpl(node_1.FileUri.create(temp.track().mkdirSync())));
41
+ container.bind(plugin_paths_protocol_1.PluginPathsService).to(plugin_paths_service_1.PluginPathsServiceImpl).inSingletonScope();
42
+ container.bind(logger_1.ILogger).toConstantValue(mock_logger_1.MockLogger);
43
+ const storage = container.get(plugins_key_value_storage_1.PluginsKeyValueStorage);
44
+ (0, chai_1.expect)(await getNumEntries(storage), 'Expected that storage should initially be empty').to.equal(0);
45
+ });
46
+ afterEach(() => {
47
+ container.get(plugins_key_value_storage_1.PluginsKeyValueStorage)['dispose']();
48
+ });
49
+ it('Should be able to set and overwrite a storage entry', async () => {
50
+ const aKey = 'akey';
51
+ const aValue = { 'this is a test': 'abc' };
52
+ const anotherValue = { 'this is an updated value': 'def' };
53
+ const storage = container.get(plugins_key_value_storage_1.PluginsKeyValueStorage);
54
+ await storage.set(aKey, aValue, GlobalStorageKind);
55
+ (0, chai_1.expect)(await getNumEntries(storage), 'Expected 1 storage entry').to.be.equal(1);
56
+ (0, chai_1.expect)(await storage.get(aKey, GlobalStorageKind), 'Expected storage entry to have initially set value')
57
+ .to.be.deep.equal(aValue);
58
+ await storage.set(aKey, anotherValue, GlobalStorageKind);
59
+ (0, chai_1.expect)(await getNumEntries(storage), 'Expected 1 storage entry').to.be.equal(1);
60
+ (0, chai_1.expect)(await storage.get(aKey, GlobalStorageKind), 'Expected storage entry to have updated value')
61
+ .to.be.deep.equal(anotherValue);
62
+ });
63
+ // This test should fail if the storage does not protect itself against concurrent accesses
64
+ it('Should be able to save several entries to storage and retrieve them as set', async () => {
65
+ const n = 100;
66
+ const key = 'test';
67
+ const valuePropName = 'test-value';
68
+ const storage = container.get(plugins_key_value_storage_1.PluginsKeyValueStorage);
69
+ await populateStorage(storage, key, valuePropName, n);
70
+ await checkStorageContent(storage, key, valuePropName, n);
71
+ });
72
+ });
73
+ const populateStorage = async (storage, keyPrefix, valuePropName, num) => {
74
+ const tasks = [];
75
+ for (let i = 0; i < num; i++) {
76
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
77
+ const value = {};
78
+ value[valuePropName] = i;
79
+ tasks.push(storage.set(keyPrefix + i, value, GlobalStorageKind));
80
+ }
81
+ await Promise.allSettled(tasks);
82
+ };
83
+ const getNumEntries = async (storage) => {
84
+ const all = await storage.getAll(GlobalStorageKind);
85
+ return Object.keys(all).length;
86
+ };
87
+ const checkStorageContent = async (storage, keyPrefix, valuePropName, num) => {
88
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
89
+ const expectedValue = {};
90
+ const all = await storage.getAll(GlobalStorageKind);
91
+ for (let i = 0; i < num; i++) {
92
+ expectedValue[valuePropName] = i;
93
+ (0, chai_1.expect)(all[keyPrefix + i], 'Expected storage entry ' + i + ' to have kept previously set value')
94
+ .to.be.deep.equal(expectedValue);
95
+ }
96
+ };
97
+ //# sourceMappingURL=plugins-key-value-storage.spec.js.map
package/lib/main/node/plugins-key-value-storage.spec.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugins-key-value-storage.spec.js","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.spec.ts"],"names":[],"mappings":"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"}
package/lib/plugin/telemetry-ext.js CHANGED
@@ -190,7 +190,7 @@ function anonymizeFilePaths(stack, cleanupPatterns) {
190
190
  }
191
191
  }
192
192
  if (lastIndex < stack.length) {
193
- updatedStack += stack.substr(lastIndex);
193
+ updatedStack += stack.substring(lastIndex);
194
194
  }
195
195
  return updatedStack;
196
196
  }
package/lib/plugin/telemetry-ext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"telemetry-ext.js","sourceRoot":"","sources":["../../src/plugin/telemetry-ext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"telemetry-ext.js","sourceRoot":"","sources":["../../src/plugin/telemetry-ext.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,35 +1,35 @@
1
1
  {
2
2
  "name": "@theia/plugin-ext",
3
- "version": "1.38.0-next.38+726092e58",
3
+ "version": "1.38.0-next.45+20f256d4e",
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.38.0-next.38+726092e58",
9
- "@theia/callhierarchy": "1.38.0-next.38+726092e58",
10
- "@theia/console": "1.38.0-next.38+726092e58",
11
- "@theia/core": "1.38.0-next.38+726092e58",
12
- "@theia/debug": "1.38.0-next.38+726092e58",
13
- "@theia/editor": "1.38.0-next.38+726092e58",
14
- "@theia/editor-preview": "1.38.0-next.38+726092e58",
15
- "@theia/file-search": "1.38.0-next.38+726092e58",
16
- "@theia/filesystem": "1.38.0-next.38+726092e58",
17
- "@theia/markers": "1.38.0-next.38+726092e58",
18
- "@theia/messages": "1.38.0-next.38+726092e58",
19
- "@theia/monaco": "1.38.0-next.38+726092e58",
8
+ "@theia/bulk-edit": "1.38.0-next.45+20f256d4e",
9
+ "@theia/callhierarchy": "1.38.0-next.45+20f256d4e",
10
+ "@theia/console": "1.38.0-next.45+20f256d4e",
11
+ "@theia/core": "1.38.0-next.45+20f256d4e",
12
+ "@theia/debug": "1.38.0-next.45+20f256d4e",
13
+ "@theia/editor": "1.38.0-next.45+20f256d4e",
14
+ "@theia/editor-preview": "1.38.0-next.45+20f256d4e",
15
+ "@theia/file-search": "1.38.0-next.45+20f256d4e",
16
+ "@theia/filesystem": "1.38.0-next.45+20f256d4e",
17
+ "@theia/markers": "1.38.0-next.45+20f256d4e",
18
+ "@theia/messages": "1.38.0-next.45+20f256d4e",
19
+ "@theia/monaco": "1.38.0-next.45+20f256d4e",
20
20
  "@theia/monaco-editor-core": "1.72.3",
21
- "@theia/navigator": "1.38.0-next.38+726092e58",
22
- "@theia/output": "1.38.0-next.38+726092e58",
23
- "@theia/plugin": "1.38.0-next.38+726092e58",
24
- "@theia/preferences": "1.38.0-next.38+726092e58",
25
- "@theia/scm": "1.38.0-next.38+726092e58",
26
- "@theia/search-in-workspace": "1.38.0-next.38+726092e58",
27
- "@theia/task": "1.38.0-next.38+726092e58",
28
- "@theia/terminal": "1.38.0-next.38+726092e58",
29
- "@theia/timeline": "1.38.0-next.38+726092e58",
30
- "@theia/typehierarchy": "1.38.0-next.38+726092e58",
31
- "@theia/variable-resolver": "1.38.0-next.38+726092e58",
32
- "@theia/workspace": "1.38.0-next.38+726092e58",
21
+ "@theia/navigator": "1.38.0-next.45+20f256d4e",
22
+ "@theia/output": "1.38.0-next.45+20f256d4e",
23
+ "@theia/plugin": "1.38.0-next.45+20f256d4e",
24
+ "@theia/preferences": "1.38.0-next.45+20f256d4e",
25
+ "@theia/scm": "1.38.0-next.45+20f256d4e",
26
+ "@theia/search-in-workspace": "1.38.0-next.45+20f256d4e",
27
+ "@theia/task": "1.38.0-next.45+20f256d4e",
28
+ "@theia/terminal": "1.38.0-next.45+20f256d4e",
29
+ "@theia/timeline": "1.38.0-next.45+20f256d4e",
30
+ "@theia/typehierarchy": "1.38.0-next.45+20f256d4e",
31
+ "@theia/variable-resolver": "1.38.0-next.45+20f256d4e",
32
+ "@theia/workspace": "1.38.0-next.45+20f256d4e",
33
33
  "@types/mime": "^2.0.1",
34
34
  "@vscode/debugprotocol": "^1.51.0",
35
35
  "decompress": "^4.2.1",
@@ -94,5 +94,5 @@
94
94
  "nyc": {
95
95
  "extends": "../../configs/nyc.json"
96
96
  },
97
- "gitHead": "726092e58ba2fb863f387067703c28c306206636"
97
+ "gitHead": "20f256d4e0d406de03f078fe3295f1b8ee566c24"
98
98
  }
package/src/common/paths-util.ts CHANGED
@@ -61,7 +61,7 @@ export function resolve(...paths: string[]): string {
61
61
 
62
62
  const resolved = normalize(processed.join(sep));
63
63
  if (resolved.length > 1 && resolved.charAt(resolved.length - 1) === sep) {
64
- return resolved.substr(0, resolved.length - 1);
64
+ return resolved.substring(0, resolved.length - 1);
65
65
  }
66
66
 
67
67
  return resolved;
@@ -108,7 +108,7 @@ export function relative(from: string, to: string): string {
108
108
  rv += downSegments.join(sep);
109
109
 
110
110
  if (rv.length > 1 && rv.charAt(rv.length - 1) === sep) {
111
- rv = rv.substr(0, rv.length - 1);
111
+ rv = rv.substring(0, rv.length - 1);
112
112
  }
113
113
  return rv;
114
114
  }
package/src/hosted/browser/hosted-plugin.ts CHANGED
@@ -698,7 +698,7 @@ export class HostedPluginSupport {
698
698
  // should be aligned with https://github.com/microsoft/vscode/blob/da5fb7d5b865aa522abc7e82c10b746834b98639/src/vs/workbench/api/node/extHostExtensionService.ts#L460-L469
699
699
  for (const activationEvent of activationEvents) {
700
700
  if (/^workspaceContains:/.test(activationEvent)) {
701
- const fileNameOrGlob = activationEvent.substr('workspaceContains:'.length);
701
+ const fileNameOrGlob = activationEvent.substring('workspaceContains:'.length);
702
702
  if (fileNameOrGlob.indexOf(ALL_ACTIVATION_EVENT) >= 0 || fileNameOrGlob.indexOf('?') >= 0) {
703
703
  includePatterns.push(fileNameOrGlob);
704
704
  } else {
package/src/hosted/browser/worker/plugin-manifest-loader.ts CHANGED
@@ -67,7 +67,7 @@ export async function loadManifest(pluginModel: PluginModel): Promise<any> {
67
67
  // translate vscode builtins, as they are published with a prefix.
68
68
  const built_prefix = '@theia/vscode-builtin-';
69
69
  if (manifest && manifest.name && manifest.name.startsWith(built_prefix)) {
70
- manifest.name = manifest.name.substr(built_prefix.length);
70
+ manifest.name = manifest.name.substring(built_prefix.length);
71
71
  }
72
72
  return manifest && translations && Object.keys(translations).length ?
73
73
  localize(manifest, translations) :
package/src/hosted/node/hosted-plugin-process.ts CHANGED
@@ -198,7 +198,7 @@ export class HostedPluginProcess implements ServerPluginRunner {
198
198
  const inspectArgPrefix = `--${options.serverName}-inspect`;
199
199
  const inspectArg = process.argv.find(v => v.startsWith(inspectArgPrefix));
200
200
  if (inspectArg !== undefined) {
201
- forkOptions.execArgv = ['--nolazy', `--inspect${inspectArg.substr(inspectArgPrefix.length)}`];
201
+ forkOptions.execArgv = ['--nolazy', `--inspect${inspectArg.substring(inspectArgPrefix.length)}`];
202
202
  }
203
203
 
204
204
  const childProcess = cp.fork(this.configuration.path, options.args, forkOptions);