@theia/toolbar 1.73.0-next.2 → 1.73.0-next.24

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 (6) hide show
  1. package/lib/browser/toolbar-storage-provider.d.ts +2 -1
  2. package/lib/browser/toolbar-storage-provider.d.ts.map +1 -1
  3. package/lib/browser/toolbar-storage-provider.js +7 -2
  4. package/lib/browser/toolbar-storage-provider.js.map +1 -1
  5. package/package.json +10 -10
  6. package/src/browser/toolbar-storage-provider.ts +6 -4
package/lib/browser/toolbar-storage-provider.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as jsoncParser from 'jsonc-parser';
2
- import { Command, Disposable, DisposableCollection, Emitter, MessageService } from '@theia/core';
2
+ import { Command, Disposable, DisposableCollection, Emitter, MessageService, ILogger } from '@theia/core';
3
3
  import { interfaces } from '@theia/core/shared/inversify';
4
4
  import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
5
5
  import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
@@ -20,6 +20,7 @@ export declare class ToolbarStorageProvider implements Disposable {
20
20
  protected lateInjector: <T>(id: interfaces.ServiceIdentifier<T>) => T;
21
21
  protected readonly USER_TOOLBAR_URI: URI;
22
22
  protected readonly defaultsFactory: () => DeflatedToolbarTree;
23
+ protected readonly logger: ILogger;
23
24
  get ready(): Promise<void>;
24
25
  protected readonly _ready: Deferred<void>;
25
26
  protected monacoWorkspace: MonacoWorkspace;
package/lib/browser/toolbar-storage-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar-storage-provider.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolbar-storage-provider.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
package/lib/browser/toolbar-storage-provider.js CHANGED
@@ -83,7 +83,7 @@ let ToolbarStorageProvider = class ToolbarStorageProvider {
83
83
  this.toolbarItemsUpdatedEmitter.fire();
84
84
  }
85
85
  catch (e) {
86
- console.error(`Failed to load toolbar config from '${this.USER_TOOLBAR_URI}'.`, e);
86
+ this.logger.error(`Failed to load toolbar config from '${this.USER_TOOLBAR_URI}'.`, e);
87
87
  }
88
88
  }
89
89
  async removeItem(position) {
@@ -256,7 +256,7 @@ let ToolbarStorageProvider = class ToolbarStorageProvider {
256
256
  catch (e) {
257
257
  const message = core_1.nls.localize('theia/toolbar/failedUpdate', "Failed to update the value of '{0}' in '{1}'.", path.join('.'), this.USER_TOOLBAR_URI.path.toString());
258
258
  this.messageService.error(core_1.nls.localize('theia/toolbar/jsonError', exports.TOOLBAR_BAD_JSON_ERROR_MESSAGE));
259
- console.error(`${message}`, e);
259
+ this.logger.error(`${message}`, e);
260
260
  return false;
261
261
  }
262
262
  }
@@ -333,6 +333,11 @@ tslib_1.__decorate([
333
333
  (0, inversify_1.inject)(toolbar_defaults_1.ToolbarDefaultsFactory),
334
334
  tslib_1.__metadata("design:type", Function)
335
335
  ], ToolbarStorageProvider.prototype, "defaultsFactory", void 0);
336
+ tslib_1.__decorate([
337
+ (0, inversify_1.inject)(core_1.ILogger),
338
+ (0, inversify_1.named)('toolbar:ToolbarStorageProvider'),
339
+ tslib_1.__metadata("design:type", Object)
340
+ ], ToolbarStorageProvider.prototype, "logger", void 0);
336
341
  tslib_1.__decorate([
337
342
  (0, inversify_1.postConstruct)(),
338
343
  tslib_1.__metadata("design:type", Function),
package/lib/browser/toolbar-storage-provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toolbar-storage-provider.js","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolbar-storage-provider.js","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/toolbar",
3
- "version": "1.73.0-next.2+8ed51a5e94d",
3
+ "version": "1.73.0-next.24+ed85d4937",
4
4
  "description": "Theia - Toolbar",
5
5
  "keywords": [
6
6
  "theia-extension"
@@ -28,15 +28,15 @@
28
28
  "update:icons": "node ./update-icons.js"
29
29
  },
30
30
  "dependencies": {
31
- "@theia/core": "1.73.0-next.2+8ed51a5e94d",
32
- "@theia/editor": "1.73.0-next.2+8ed51a5e94d",
33
- "@theia/file-search": "1.73.0-next.2+8ed51a5e94d",
34
- "@theia/filesystem": "1.73.0-next.2+8ed51a5e94d",
35
- "@theia/monaco": "1.73.0-next.2+8ed51a5e94d",
31
+ "@theia/core": "1.73.0-next.24+ed85d4937",
32
+ "@theia/editor": "1.73.0-next.24+ed85d4937",
33
+ "@theia/file-search": "1.73.0-next.24+ed85d4937",
34
+ "@theia/filesystem": "1.73.0-next.24+ed85d4937",
35
+ "@theia/monaco": "1.73.0-next.24+ed85d4937",
36
36
  "@theia/monaco-editor-core": "1.108.201",
37
- "@theia/search-in-workspace": "1.73.0-next.2+8ed51a5e94d",
38
- "@theia/userstorage": "1.73.0-next.2+8ed51a5e94d",
39
- "@theia/workspace": "1.73.0-next.2+8ed51a5e94d",
37
+ "@theia/search-in-workspace": "1.73.0-next.24+ed85d4937",
38
+ "@theia/userstorage": "1.73.0-next.24+ed85d4937",
39
+ "@theia/workspace": "1.73.0-next.24+ed85d4937",
40
40
  "ajv": "^6.15.0",
41
41
  "jsonc-parser": "^3.3.1",
42
42
  "perfect-scrollbar": "1.5.5",
@@ -51,5 +51,5 @@
51
51
  "publishConfig": {
52
52
  "access": "public"
53
53
  },
54
- "gitHead": "8ed51a5e94d15a6003725683a14773c6f8d64ac6"
54
+ "gitHead": "ed85d49379279b6472543df174249476e1619bac"
55
55
  }
package/src/browser/toolbar-storage-provider.ts CHANGED
@@ -15,8 +15,8 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import * as jsoncParser from 'jsonc-parser';
18
- import { Command, deepClone, Disposable, DisposableCollection, Emitter, MessageService, nls } from '@theia/core';
19
- import { injectable, postConstruct, inject, interfaces } from '@theia/core/shared/inversify';
18
+ import { Command, deepClone, Disposable, DisposableCollection, Emitter, MessageService, nls, ILogger } from '@theia/core';
19
+ import { injectable, postConstruct, inject, interfaces, named } from '@theia/core/shared/inversify';
20
20
  import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
21
21
  import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
22
22
  import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
@@ -53,6 +53,8 @@ export class ToolbarStorageProvider implements Disposable {
53
53
  @inject(LateInjector) protected lateInjector: <T>(id: interfaces.ServiceIdentifier<T>) => T;
54
54
  @inject(UserToolbarURI) protected readonly USER_TOOLBAR_URI: URI;
55
55
  @inject(ToolbarDefaultsFactory) protected readonly defaultsFactory: () => DeflatedToolbarTree;
56
+ @inject(ILogger) @named('toolbar:ToolbarStorageProvider')
57
+ protected readonly logger: ILogger;
56
58
 
57
59
  get ready(): Promise<void> {
58
60
  return this._ready.promise;
@@ -111,7 +113,7 @@ export class ToolbarStorageProvider implements Disposable {
111
113
  }
112
114
  this.toolbarItemsUpdatedEmitter.fire();
113
115
  } catch (e) {
114
- console.error(`Failed to load toolbar config from '${this.USER_TOOLBAR_URI}'.`, e);
116
+ this.logger.error(`Failed to load toolbar config from '${this.USER_TOOLBAR_URI}'.`, e);
115
117
  }
116
118
  }
117
119
 
@@ -296,7 +298,7 @@ export class ToolbarStorageProvider implements Disposable {
296
298
  } catch (e) {
297
299
  const message = nls.localize('theia/toolbar/failedUpdate', "Failed to update the value of '{0}' in '{1}'.", path.join('.'), this.USER_TOOLBAR_URI.path.toString());
298
300
  this.messageService.error(nls.localize('theia/toolbar/jsonError', TOOLBAR_BAD_JSON_ERROR_MESSAGE));
299
- console.error(`${message}`, e);
301
+ this.logger.error(`${message}`, e);
300
302
  return false;
301
303
  }
302
304
  }