@theia/variable-resolver 1.75.0-next.29 → 1.75.0-next.34
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/variable-resolver-service.spec.js +3 -0
- package/lib/browser/variable-resolver-service.spec.js.map +1 -1
- package/lib/browser/variable.d.ts +2 -1
- package/lib/browser/variable.d.ts.map +1 -1
- package/lib/browser/variable.js +6 -1
- package/lib/browser/variable.js.map +1 -1
- package/package.json +3 -3
- package/src/browser/variable-resolver-service.spec.ts +3 -0
- package/src/browser/variable.ts +6 -3
|
@@ -20,6 +20,8 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
20
20
|
const common_1 = require("@theia/core/lib/common");
|
|
21
21
|
const variable_1 = require("./variable");
|
|
22
22
|
const variable_resolver_service_1 = require("./variable-resolver-service");
|
|
23
|
+
const core_1 = require("@theia/core");
|
|
24
|
+
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
23
25
|
const expect = chai.expect;
|
|
24
26
|
before(() => {
|
|
25
27
|
chai.config.showDiff = true;
|
|
@@ -31,6 +33,7 @@ describe('variable-resolver-service', () => {
|
|
|
31
33
|
let variableResolverService;
|
|
32
34
|
beforeEach(() => {
|
|
33
35
|
testContainer = new inversify_1.Container();
|
|
36
|
+
testContainer.bind(core_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
|
|
34
37
|
testContainer.bind(variable_1.VariableRegistry).toSelf().inSingletonScope();
|
|
35
38
|
testContainer.bind(variable_resolver_service_1.VariableResolverService).toSelf().inSingletonScope();
|
|
36
39
|
variableRegistry = testContainer.get(variable_1.VariableRegistry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-service.spec.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,6BAA6B;AAC7B,4DAAyD;AACzD,mDAAmD;AACnD,yCAA8C;AAC9C,2EAAsE;
|
|
1
|
+
{"version":3,"file":"variable-resolver-service.spec.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Disposable, DisposableCollection, MaybePromise } from '@theia/core';
|
|
1
|
+
import { Disposable, DisposableCollection, MaybePromise, ILogger } from '@theia/core';
|
|
2
2
|
import URI from '@theia/core/lib/common/uri';
|
|
3
3
|
import { CommandIdVariables } from '../common/variable-types';
|
|
4
4
|
/**
|
|
@@ -33,6 +33,7 @@ export interface VariableContribution {
|
|
|
33
33
|
export declare class VariableRegistry implements Disposable {
|
|
34
34
|
protected readonly variables: Map<string, Variable>;
|
|
35
35
|
protected readonly toDispose: DisposableCollection;
|
|
36
|
+
protected readonly logger: ILogger;
|
|
36
37
|
dispose(): void;
|
|
37
38
|
/**
|
|
38
39
|
* Register the given variable.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/browser/variable.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"variable.d.ts","sourceRoot":"","sources":["../../src/browser/variable.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,QAAQ;IAErB;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;OAIG;IACH,OAAO,CACH,OAAO,CAAC,EAAE,GAAG,EACb,QAAQ,CAAC,EAAE,MAAM,EACjB,oBAAoB,CAAC,EAAE,MAAM,EAC7B,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,aAAa,CAAC,EAAE,OAAO,GAExB,YAAY,CAAC,GAAG,CAAC,CAAC;CACxB;AAED,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AACnE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,CAAC;CACxD;AAED;;GAEG;AACH,qBACa,gBAAiB,YAAW,UAAU;IAE/C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAChE,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,IAAI,IAAI;IAIf;;;OAGG;IACH,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,GAAG,UAAU;IAahD;;OAEG;IACH,YAAY,IAAI,QAAQ,EAAE;IAI1B;;OAEG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAI/C;;;OAGG;IACH,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE;CAGzD"}
|
package/lib/browser/variable.js
CHANGED
|
@@ -37,7 +37,7 @@ let VariableRegistry = class VariableRegistry {
|
|
|
37
37
|
*/
|
|
38
38
|
registerVariable(variable) {
|
|
39
39
|
if (this.variables.has(variable.name)) {
|
|
40
|
-
|
|
40
|
+
this.logger.warn(`A variables with name ${variable.name} is already registered.`);
|
|
41
41
|
return core_1.Disposable.NULL;
|
|
42
42
|
}
|
|
43
43
|
this.variables.set(variable.name, variable);
|
|
@@ -68,6 +68,11 @@ let VariableRegistry = class VariableRegistry {
|
|
|
68
68
|
}
|
|
69
69
|
};
|
|
70
70
|
exports.VariableRegistry = VariableRegistry;
|
|
71
|
+
tslib_1.__decorate([
|
|
72
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
73
|
+
(0, inversify_1.named)('variable-resolver:VariableRegistry'),
|
|
74
|
+
tslib_1.__metadata("design:type", Object)
|
|
75
|
+
], VariableRegistry.prototype, "logger", void 0);
|
|
71
76
|
exports.VariableRegistry = VariableRegistry = tslib_1.__decorate([
|
|
72
77
|
(0, inversify_1.injectable)()
|
|
73
78
|
], VariableRegistry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/browser/variable.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,
|
|
1
|
+
{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/browser/variable.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,4DAAyE;AACzE,sCAAsF;AAkCzE,QAAA,oBAAoB,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAQnE;;GAEG;AAEI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAEgB,cAAS,GAA0B,IAAI,GAAG,EAAE,CAAC;QAC7C,cAAS,GAAG,IAAI,2BAAoB,EAAE,CAAC;IA+C9D,CAAC;IA1CG,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,QAAkB;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,CAAC,IAAI,yBAAyB,CAAC,CAAC;YAClF,OAAO,iBAAU,CAAC,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG;YACf,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;SACtD,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,YAAY;QACR,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,IAAY;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,SAAqB;QACnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;CACJ,CAAA;AAlDY,4CAAgB;AAMN;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,oCAAoC,CAAC;;gDAC1B;2BAN1B,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAkD5B"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/variable-resolver",
|
|
3
|
-
"version": "1.75.0-next.
|
|
3
|
+
"version": "1.75.0-next.34+11fb66739",
|
|
4
4
|
"description": "Theia - Variable Resolver Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.75.0-next.
|
|
6
|
+
"@theia/core": "1.75.0-next.34+11fb66739",
|
|
7
7
|
"tslib": "^2.8.1"
|
|
8
8
|
},
|
|
9
9
|
"publishConfig": {
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"nyc": {
|
|
51
51
|
"extends": "../../configs/nyc.json"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "11fb667399ac7df64df9edc0c835ace6b0e88c2e"
|
|
54
54
|
}
|
|
@@ -19,6 +19,8 @@ import { Container } from '@theia/core/shared/inversify';
|
|
|
19
19
|
import { cancelled } from '@theia/core/lib/common';
|
|
20
20
|
import { VariableRegistry } from './variable';
|
|
21
21
|
import { VariableResolverService } from './variable-resolver-service';
|
|
22
|
+
import { ILogger } from '@theia/core';
|
|
23
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
22
24
|
|
|
23
25
|
const expect = chai.expect;
|
|
24
26
|
|
|
@@ -35,6 +37,7 @@ describe('variable-resolver-service', () => {
|
|
|
35
37
|
|
|
36
38
|
beforeEach(() => {
|
|
37
39
|
testContainer = new Container();
|
|
40
|
+
testContainer.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
38
41
|
testContainer.bind(VariableRegistry).toSelf().inSingletonScope();
|
|
39
42
|
testContainer.bind(VariableResolverService).toSelf().inSingletonScope();
|
|
40
43
|
variableRegistry = testContainer.get(VariableRegistry);
|
package/src/browser/variable.ts
CHANGED
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { Disposable, DisposableCollection, MaybePromise } from '@theia/core';
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Disposable, DisposableCollection, MaybePromise, ILogger } from '@theia/core';
|
|
19
19
|
import URI from '@theia/core/lib/common/uri';
|
|
20
20
|
import { CommandIdVariables } from '../common/variable-types';
|
|
21
21
|
|
|
@@ -66,6 +66,9 @@ export class VariableRegistry implements Disposable {
|
|
|
66
66
|
protected readonly variables: Map<string, Variable> = new Map();
|
|
67
67
|
protected readonly toDispose = new DisposableCollection();
|
|
68
68
|
|
|
69
|
+
@inject(ILogger) @named('variable-resolver:VariableRegistry')
|
|
70
|
+
protected readonly logger: ILogger;
|
|
71
|
+
|
|
69
72
|
dispose(): void {
|
|
70
73
|
this.toDispose.dispose();
|
|
71
74
|
}
|
|
@@ -76,7 +79,7 @@ export class VariableRegistry implements Disposable {
|
|
|
76
79
|
*/
|
|
77
80
|
registerVariable(variable: Variable): Disposable {
|
|
78
81
|
if (this.variables.has(variable.name)) {
|
|
79
|
-
|
|
82
|
+
this.logger.warn(`A variables with name ${variable.name} is already registered.`);
|
|
80
83
|
return Disposable.NULL;
|
|
81
84
|
}
|
|
82
85
|
this.variables.set(variable.name, variable);
|