@theia/variable-resolver 1.77.0-next.99 → 1.78.0-next.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/common-variable-contribution.d.ts +1 -1
- package/lib/browser/common-variable-contribution.d.ts.map +1 -1
- package/lib/browser/common-variable-contribution.js +35 -44
- package/lib/browser/common-variable-contribution.js.map +1 -1
- package/lib/browser/common-variable-contribution.spec.js +36 -39
- package/lib/browser/common-variable-contribution.spec.js.map +1 -1
- package/lib/browser/index.d.ts +3 -3
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +3 -6
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/variable-input-schema.js +1 -4
- package/lib/browser/variable-input-schema.js.map +1 -1
- package/lib/browser/variable-input.js +1 -2
- package/lib/browser/variable-quick-open-service.d.ts +2 -2
- package/lib/browser/variable-quick-open-service.d.ts.map +1 -1
- package/lib/browser/variable-quick-open-service.js +17 -24
- package/lib/browser/variable-quick-open-service.js.map +1 -1
- package/lib/browser/variable-resolver-frontend-contribution.d.ts +2 -2
- package/lib/browser/variable-resolver-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/variable-resolver-frontend-contribution.js +14 -19
- package/lib/browser/variable-resolver-frontend-contribution.js.map +1 -1
- package/lib/browser/variable-resolver-frontend-contribution.spec.d.ts +1 -1
- package/lib/browser/variable-resolver-frontend-contribution.spec.d.ts.map +1 -1
- package/lib/browser/variable-resolver-frontend-contribution.spec.js +23 -28
- package/lib/browser/variable-resolver-frontend-contribution.spec.js.map +1 -1
- package/lib/browser/variable-resolver-frontend-module.js +18 -20
- package/lib/browser/variable-resolver-frontend-module.js.map +1 -1
- package/lib/browser/variable-resolver-service.d.ts +2 -2
- package/lib/browser/variable-resolver-service.d.ts.map +1 -1
- package/lib/browser/variable-resolver-service.js +12 -16
- package/lib/browser/variable-resolver-service.js.map +1 -1
- package/lib/browser/variable-resolver-service.spec.js +14 -17
- package/lib/browser/variable-resolver-service.spec.js.map +1 -1
- package/lib/browser/variable.d.ts +1 -1
- package/lib/browser/variable.d.ts.map +1 -1
- package/lib/browser/variable.js +12 -16
- package/lib/browser/variable.js.map +1 -1
- package/lib/browser/variable.spec.js +10 -13
- package/lib/browser/variable.spec.js.map +1 -1
- package/lib/common/variable-types.js +1 -2
- package/lib/common/variable-types.js.map +1 -1
- package/package.json +13 -4
- package/src/browser/common-variable-contribution.spec.ts +3 -3
- package/src/browser/common-variable-contribution.ts +4 -4
- package/src/browser/index.ts +3 -3
- package/src/browser/variable-quick-open-service.ts +2 -2
- package/src/browser/variable-resolver-frontend-contribution.spec.ts +3 -3
- package/src/browser/variable-resolver-frontend-contribution.ts +2 -2
- package/src/browser/variable-resolver-frontend-module.ts +5 -5
- package/src/browser/variable-resolver-service.spec.ts +2 -2
- package/src/browser/variable-resolver-service.ts +2 -2
- package/src/browser/variable.spec.ts +1 -1
- package/src/browser/variable.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable-resolver-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.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,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,EAAE,OAAO,EAAwC,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC7G,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,MAAM,CAAC,MAAM,cAAc,GAAY,OAAO,CAAC,kBAAkB,CAAC;IAC9D,EAAE,EAAE,eAAe;IACnB,KAAK,EAAE,oBAAoB;CAC9B,EAAE,yCAAyC,CAAC,CAAC;AAGvC,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAE7C,YAEuB,oBAAgE,EACtC,gBAAkC,EAC1B,wBAAkD;QAFpF,yBAAoB,GAApB,oBAAoB,CAA4C;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAC1B,6BAAwB,GAAxB,wBAAwB,CAA0B;IACvG,CAAC;IAEL,OAAO;QACH,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAC3D,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CACnD,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,QAAyB;QACtC,QAAQ,CAAC,eAAe,CAAC,cAAc,EAAE;YACrC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;YACrB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE;SACtD,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AArBY,oCAAoC;IADhD,UAAU,EAAE;IAIJ,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAAE,WAAA,KAAK,CAAC,oBAAoB,CAAC,CAAA;IAEzD,WAAA,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxB,WAAA,MAAM,CAAC,wBAAwB,CAAC,CAAA;GAN5B,oCAAoC,CAqBhD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { VariableContribution, VariableRegistry } from './variable';
|
|
1
|
+
import { VariableContribution, VariableRegistry } from './variable.js';
|
|
2
2
|
export declare class TestVariableContribution implements VariableContribution {
|
|
3
3
|
registerVariables(variables: VariableRegistry): void;
|
|
4
4
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-frontend-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.spec.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"variable-resolver-frontend-contribution.spec.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.spec.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAwDvE,qBAAa,wBAAyB,YAAW,oBAAoB;IAEjE,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;CAYvD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,20 +13,17 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const variable_1 = require("./variable");
|
|
29
|
-
const variable_quick_open_service_1 = require("./variable-quick-open-service");
|
|
30
|
-
const variable_resolver_frontend_contribution_1 = require("./variable-resolver-frontend-contribution");
|
|
16
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
17
|
+
let disableJSDOM = enableJSDOM();
|
|
18
|
+
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
19
|
+
FrontendApplicationConfigProvider.set({});
|
|
20
|
+
import * as chai from 'chai';
|
|
21
|
+
import { Container, ContainerModule } from '@theia/core/shared/inversify';
|
|
22
|
+
import { ILogger, bindContributionProvider } from '@theia/core/lib/common';
|
|
23
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
24
|
+
import { VariableContribution, VariableRegistry } from './variable.js';
|
|
25
|
+
import { VariableQuickOpenService } from './variable-quick-open-service.js';
|
|
26
|
+
import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution.js';
|
|
31
27
|
disableJSDOM();
|
|
32
28
|
const expect = chai.expect;
|
|
33
29
|
before(() => {
|
|
@@ -38,16 +34,16 @@ describe('variable-resolver-frontend-contribution', () => {
|
|
|
38
34
|
let testContainer;
|
|
39
35
|
let variableRegistry;
|
|
40
36
|
before(() => {
|
|
41
|
-
disableJSDOM =
|
|
42
|
-
testContainer = new
|
|
43
|
-
const module = new
|
|
44
|
-
|
|
45
|
-
bind(
|
|
46
|
-
bind(
|
|
47
|
-
bind(
|
|
37
|
+
disableJSDOM = enableJSDOM();
|
|
38
|
+
testContainer = new Container();
|
|
39
|
+
const module = new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
40
|
+
bindContributionProvider(bind, VariableContribution);
|
|
41
|
+
bind(VariableContribution).toConstantValue(new TestVariableContribution());
|
|
42
|
+
bind(ILogger).to(MockLogger);
|
|
43
|
+
bind(VariableRegistry).toSelf().inSingletonScope();
|
|
48
44
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
49
|
-
bind(
|
|
50
|
-
bind(
|
|
45
|
+
bind(VariableQuickOpenService).toConstantValue({}); // mock VariableQuickOpenService
|
|
46
|
+
bind(VariableResolverFrontendContribution).toSelf();
|
|
51
47
|
});
|
|
52
48
|
testContainer.load(module);
|
|
53
49
|
});
|
|
@@ -55,8 +51,8 @@ describe('variable-resolver-frontend-contribution', () => {
|
|
|
55
51
|
disableJSDOM();
|
|
56
52
|
});
|
|
57
53
|
beforeEach(() => {
|
|
58
|
-
variableRegistry = testContainer.get(
|
|
59
|
-
const variableRegistrar = testContainer.get(
|
|
54
|
+
variableRegistry = testContainer.get(VariableRegistry);
|
|
55
|
+
const variableRegistrar = testContainer.get(VariableResolverFrontendContribution);
|
|
60
56
|
variableRegistrar.onStart();
|
|
61
57
|
});
|
|
62
58
|
it('should register all variables from the contribution points', () => {
|
|
@@ -66,7 +62,7 @@ describe('variable-resolver-frontend-contribution', () => {
|
|
|
66
62
|
expect(variables[1].name).to.be.equal('lineNumber');
|
|
67
63
|
});
|
|
68
64
|
});
|
|
69
|
-
class TestVariableContribution {
|
|
65
|
+
export class TestVariableContribution {
|
|
70
66
|
registerVariables(variables) {
|
|
71
67
|
variables.registerVariable({
|
|
72
68
|
name: 'file',
|
|
@@ -80,5 +76,4 @@ class TestVariableContribution {
|
|
|
80
76
|
});
|
|
81
77
|
}
|
|
82
78
|
}
|
|
83
|
-
exports.TestVariableContribution = TestVariableContribution;
|
|
84
79
|
//# sourceMappingURL=variable-resolver-frontend-contribution.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-frontend-contribution.spec.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable-resolver-frontend-contribution.spec.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-contribution.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,25 +13,24 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
bind(
|
|
28
|
-
bind
|
|
29
|
-
(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
bind(identifier).toService(variable_resolver_frontend_contribution_1.VariableResolverFrontendContribution);
|
|
16
|
+
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
17
|
+
import { bindRootContributionProvider, CommandContribution } from '@theia/core';
|
|
18
|
+
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
|
|
19
|
+
import { VariableRegistry, VariableContribution } from './variable.js';
|
|
20
|
+
import { VariableQuickOpenService } from './variable-quick-open-service.js';
|
|
21
|
+
import { VariableResolverFrontendContribution } from './variable-resolver-frontend-contribution.js';
|
|
22
|
+
import { VariableResolverService } from './variable-resolver-service.js';
|
|
23
|
+
import { CommonVariableContribution } from './common-variable-contribution.js';
|
|
24
|
+
export default new ContainerModule(bind => {
|
|
25
|
+
bind(VariableRegistry).toSelf().inSingletonScope();
|
|
26
|
+
bind(VariableResolverService).toSelf().inSingletonScope();
|
|
27
|
+
bindRootContributionProvider(bind, VariableContribution);
|
|
28
|
+
bind(VariableResolverFrontendContribution).toSelf().inSingletonScope();
|
|
29
|
+
for (const identifier of [FrontendApplicationContribution, CommandContribution]) {
|
|
30
|
+
bind(identifier).toService(VariableResolverFrontendContribution);
|
|
33
31
|
}
|
|
34
|
-
bind(
|
|
35
|
-
bind(
|
|
36
|
-
bind(
|
|
32
|
+
bind(VariableQuickOpenService).toSelf().inSingletonScope();
|
|
33
|
+
bind(CommonVariableContribution).toSelf().inSingletonScope();
|
|
34
|
+
bind(VariableContribution).toService(CommonVariableContribution);
|
|
37
35
|
});
|
|
38
36
|
//# sourceMappingURL=variable-resolver-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-frontend-module.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable-resolver-frontend-module.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-frontend-module.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,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,oCAAoC,EAAE,MAAM,8CAA8C,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAE/E,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,4BAA4B,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAEzD,IAAI,CAAC,oCAAoC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvE,KAAK,MAAM,UAAU,IAAI,CAAC,+BAA+B,EAAE,mBAAmB,CAAC,EAAE,CAAC;QAC9E,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,CAAC,wBAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE3D,IAAI,CAAC,0BAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,oBAAoB,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;AACrE,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { VariableRegistry } from './variable';
|
|
1
|
+
import { VariableRegistry } from './variable.js';
|
|
2
2
|
import URI from '@theia/core/lib/common/uri';
|
|
3
|
-
import { CommandIdVariables } from '../common/variable-types';
|
|
3
|
+
import { CommandIdVariables } from '../common/variable-types.js';
|
|
4
4
|
export interface VariableResolveOptions {
|
|
5
5
|
context?: URI;
|
|
6
6
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-service.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"variable-resolver-service.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE,MAAM,WAAW,sBAAsB;IACnC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED;;GAEG;AACH,qBACa,uBAAuB;IAEhC,SAAS,CAAC,MAAM,CAAC,UAAU,SAAkB;IAEnB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEhF;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;IAIlG;;;;;OAKG;IACG,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;cAYxE,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;cAiB7E,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;cAYvF,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;cAS/H,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;cAQzF,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAS3G;AACD,yBAAiB,uBAAuB,CAAC;IAErC,MAAa,OAAO;QAKZ,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;QACrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;QAJtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,kCAAyC;oBAG7C,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,sBAAsB;QAGtD,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;QAI/B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;KAsC7C;CACJ"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -15,13 +14,11 @@
|
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
16
|
var VariableResolverService_1;
|
|
18
|
-
|
|
19
|
-
exports.VariableResolverService = void 0;
|
|
20
|
-
const tslib_1 = require("tslib");
|
|
17
|
+
import { __decorate } from "tslib";
|
|
21
18
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
19
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
20
|
+
import { VariableRegistry } from './variable.js';
|
|
21
|
+
import { isCancelled } from '@theia/core';
|
|
25
22
|
/**
|
|
26
23
|
* The variable resolver service should be used to resolve variables in strings.
|
|
27
24
|
*/
|
|
@@ -51,7 +48,7 @@ let VariableResolverService = class VariableResolverService {
|
|
|
51
48
|
return await this.doResolve(value, context);
|
|
52
49
|
}
|
|
53
50
|
catch (error) {
|
|
54
|
-
if (
|
|
51
|
+
if (isCancelled(error)) {
|
|
55
52
|
return undefined;
|
|
56
53
|
}
|
|
57
54
|
throw error;
|
|
@@ -107,14 +104,13 @@ let VariableResolverService = class VariableResolverService {
|
|
|
107
104
|
}
|
|
108
105
|
}
|
|
109
106
|
};
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
(0, inversify_1.inject)(variable_1.VariableRegistry),
|
|
113
|
-
tslib_1.__metadata("design:type", variable_1.VariableRegistry)
|
|
107
|
+
__decorate([
|
|
108
|
+
inject(VariableRegistry)
|
|
114
109
|
], VariableResolverService.prototype, "variableRegistry", void 0);
|
|
115
|
-
|
|
116
|
-
|
|
110
|
+
VariableResolverService = VariableResolverService_1 = __decorate([
|
|
111
|
+
injectable()
|
|
117
112
|
], VariableResolverService);
|
|
113
|
+
export { VariableResolverService };
|
|
118
114
|
(function (VariableResolverService) {
|
|
119
115
|
class Context {
|
|
120
116
|
constructor(variableRegistry, options) {
|
|
@@ -150,7 +146,7 @@ exports.VariableResolverService = VariableResolverService = VariableResolverServ
|
|
|
150
146
|
}
|
|
151
147
|
}
|
|
152
148
|
catch (e) {
|
|
153
|
-
if (
|
|
149
|
+
if (isCancelled(e)) {
|
|
154
150
|
throw e;
|
|
155
151
|
}
|
|
156
152
|
this.resolved.set(name, undefined);
|
|
@@ -159,5 +155,5 @@ exports.VariableResolverService = VariableResolverService = VariableResolverServ
|
|
|
159
155
|
}
|
|
160
156
|
}
|
|
161
157
|
VariableResolverService.Context = Context;
|
|
162
|
-
})(VariableResolverService || (
|
|
158
|
+
})(VariableResolverService || (VariableResolverService = {}));
|
|
163
159
|
//# sourceMappingURL=variable-resolver-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-service.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable-resolver-service.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,15 +13,13 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const core_1 = require("@theia/core");
|
|
25
|
-
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
16
|
+
import * as chai from 'chai';
|
|
17
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
18
|
+
import { cancelled } from '@theia/core/lib/common';
|
|
19
|
+
import { VariableRegistry } from './variable.js';
|
|
20
|
+
import { VariableResolverService } from './variable-resolver-service.js';
|
|
21
|
+
import { ILogger } from '@theia/core';
|
|
22
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
26
23
|
const expect = chai.expect;
|
|
27
24
|
before(() => {
|
|
28
25
|
chai.config.showDiff = true;
|
|
@@ -33,11 +30,11 @@ describe('variable-resolver-service', () => {
|
|
|
33
30
|
let variableRegistry;
|
|
34
31
|
let variableResolverService;
|
|
35
32
|
beforeEach(() => {
|
|
36
|
-
testContainer = new
|
|
37
|
-
testContainer.bind(
|
|
38
|
-
testContainer.bind(
|
|
39
|
-
testContainer.bind(
|
|
40
|
-
variableRegistry = testContainer.get(
|
|
33
|
+
testContainer = new Container();
|
|
34
|
+
testContainer.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
35
|
+
testContainer.bind(VariableRegistry).toSelf().inSingletonScope();
|
|
36
|
+
testContainer.bind(VariableResolverService).toSelf().inSingletonScope();
|
|
37
|
+
variableRegistry = testContainer.get(VariableRegistry);
|
|
41
38
|
variableRegistry.registerVariable({
|
|
42
39
|
name: 'file',
|
|
43
40
|
description: 'current file',
|
|
@@ -48,7 +45,7 @@ describe('variable-resolver-service', () => {
|
|
|
48
45
|
description: 'current line number',
|
|
49
46
|
resolve: () => Promise.resolve('6')
|
|
50
47
|
});
|
|
51
|
-
variableResolverService = testContainer.get(
|
|
48
|
+
variableResolverService = testContainer.get(VariableResolverService);
|
|
52
49
|
});
|
|
53
50
|
it('should resolve known variables in a text', async () => {
|
|
54
51
|
const resolved = await variableResolverService.resolve('file: ${file}; line: ${lineNumber}');
|
|
@@ -69,7 +66,7 @@ describe('variable-resolver-service', () => {
|
|
|
69
66
|
name: 'command',
|
|
70
67
|
resolve: (contextUri, commandId) => {
|
|
71
68
|
if (commandId === 'testCommand') {
|
|
72
|
-
throw
|
|
69
|
+
throw cancelled();
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
72
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver-service.spec.js","sourceRoot":"","sources":["../../src/browser/variable-resolver-service.spec.ts"],"names":[],"mappings":"
|
|
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,6 +1,6 @@
|
|
|
1
1
|
import { Disposable, DisposableCollection, MaybePromise, ILogger } from '@theia/core';
|
|
2
2
|
import URI from '@theia/core/lib/common/uri';
|
|
3
|
-
import { CommandIdVariables } from '../common/variable-types';
|
|
3
|
+
import { CommandIdVariables } from '../common/variable-types.js';
|
|
4
4
|
/**
|
|
5
5
|
* Variable can be used inside of strings using ${variableName} syntax.
|
|
6
6
|
*/
|
|
@@ -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,OAAO,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
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,6BAA6B,CAAC;AAEjE;;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
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,19 +13,17 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
const core_1 = require("@theia/core");
|
|
22
|
-
exports.VariableContribution = Symbol('VariableContribution');
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Disposable, DisposableCollection, ILogger } from '@theia/core';
|
|
19
|
+
export const VariableContribution = Symbol('VariableContribution');
|
|
23
20
|
/**
|
|
24
21
|
* The variable registry manages variables.
|
|
25
22
|
*/
|
|
26
23
|
let VariableRegistry = class VariableRegistry {
|
|
27
24
|
constructor() {
|
|
28
25
|
this.variables = new Map();
|
|
29
|
-
this.toDispose = new
|
|
26
|
+
this.toDispose = new DisposableCollection();
|
|
30
27
|
}
|
|
31
28
|
dispose() {
|
|
32
29
|
this.toDispose.dispose();
|
|
@@ -38,7 +35,7 @@ let VariableRegistry = class VariableRegistry {
|
|
|
38
35
|
registerVariable(variable) {
|
|
39
36
|
if (this.variables.has(variable.name)) {
|
|
40
37
|
this.logger.warn(`A variables with name ${variable.name} is already registered.`);
|
|
41
|
-
return
|
|
38
|
+
return Disposable.NULL;
|
|
42
39
|
}
|
|
43
40
|
this.variables.set(variable.name, variable);
|
|
44
41
|
const disposable = {
|
|
@@ -67,13 +64,12 @@ let VariableRegistry = class VariableRegistry {
|
|
|
67
64
|
return variables.map(v => this.registerVariable(v));
|
|
68
65
|
}
|
|
69
66
|
};
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
(
|
|
73
|
-
(0, inversify_1.named)('variable-resolver:VariableRegistry'),
|
|
74
|
-
tslib_1.__metadata("design:type", Object)
|
|
67
|
+
__decorate([
|
|
68
|
+
inject(ILogger),
|
|
69
|
+
named('variable-resolver:VariableRegistry')
|
|
75
70
|
], VariableRegistry.prototype, "logger", void 0);
|
|
76
|
-
|
|
77
|
-
|
|
71
|
+
VariableRegistry = __decorate([
|
|
72
|
+
injectable()
|
|
78
73
|
], VariableRegistry);
|
|
74
|
+
export { VariableRegistry };
|
|
79
75
|
//# sourceMappingURL=variable.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.js","sourceRoot":"","sources":["../../src/browser/variable.ts"],"names":[],"mappings":"
|
|
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,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAgB,OAAO,EAAE,MAAM,aAAa,CAAC;AAkCtF,MAAM,CAAC,MAAM,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,oBAAoB,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,UAAU,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;AA5CsB;IADlB,MAAM,CAAC,OAAO,CAAC;IAAE,KAAK,CAAC,oCAAoC,CAAC;gDAC1B;AAN1B,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAkD5B"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Red Hat, Inc. and others.
|
|
4
3
|
//
|
|
@@ -14,13 +13,11 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
23
|
-
const variable_1 = require("./variable");
|
|
16
|
+
import * as chai from 'chai';
|
|
17
|
+
import { Container, ContainerModule } from '@theia/core/shared/inversify';
|
|
18
|
+
import { ILogger } from '@theia/core/lib/common';
|
|
19
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
20
|
+
import { VariableRegistry } from './variable.js';
|
|
24
21
|
const expect = chai.expect;
|
|
25
22
|
let variableRegistry;
|
|
26
23
|
before(() => {
|
|
@@ -30,15 +27,15 @@ before(() => {
|
|
|
30
27
|
describe('variable api', () => {
|
|
31
28
|
let testContainer;
|
|
32
29
|
before(() => {
|
|
33
|
-
testContainer = new
|
|
34
|
-
const module = new
|
|
35
|
-
bind(
|
|
36
|
-
bind(
|
|
30
|
+
testContainer = new Container();
|
|
31
|
+
const module = new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
32
|
+
bind(ILogger).to(MockLogger);
|
|
33
|
+
bind(VariableRegistry).toSelf();
|
|
37
34
|
});
|
|
38
35
|
testContainer.load(module);
|
|
39
36
|
});
|
|
40
37
|
beforeEach(() => {
|
|
41
|
-
variableRegistry = testContainer.get(
|
|
38
|
+
variableRegistry = testContainer.get(VariableRegistry);
|
|
42
39
|
});
|
|
43
40
|
it('should register and return variable', () => {
|
|
44
41
|
registerTestVariable();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable.spec.js","sourceRoot":"","sources":["../../src/browser/variable.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable.spec.js","sourceRoot":"","sources":["../../src/browser/variable.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,5 +13,5 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
16
|
+
export {};
|
|
18
17
|
//# sourceMappingURL=variable-types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-types.js","sourceRoot":"","sources":["../../src/common/variable-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"variable-types.js","sourceRoot":"","sources":["../../src/common/variable-types.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,gFAAgF;AAChF,gFAAgF"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/variable-resolver",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.78.0-next.0+b0e3080cb",
|
|
4
4
|
"description": "Theia - Variable Resolver Extension",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
+
"@theia/core": "1.78.0-next.0+b0e3080cb",
|
|
7
8
|
"tslib": "^2.8.1"
|
|
8
9
|
},
|
|
9
10
|
"publishConfig": {
|
|
@@ -45,10 +46,18 @@
|
|
|
45
46
|
"watch": "theiaext watch"
|
|
46
47
|
},
|
|
47
48
|
"devDependencies": {
|
|
48
|
-
"@theia/ext-scripts": "1.
|
|
49
|
+
"@theia/ext-scripts": "1.77.0"
|
|
49
50
|
},
|
|
50
51
|
"nyc": {
|
|
51
52
|
"extends": "../../configs/nyc.json"
|
|
52
53
|
},
|
|
53
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "b0e3080cb1b1fff5616555f1bf679834129da171",
|
|
55
|
+
"exports": {
|
|
56
|
+
"./package.json": "./package.json",
|
|
57
|
+
"./lib/browser": "./lib/browser/index.js",
|
|
58
|
+
"./lib/*.json": "./lib/*.json",
|
|
59
|
+
"./lib/*.js": "./lib/*.js",
|
|
60
|
+
"./lib/*": "./lib/*.js",
|
|
61
|
+
"./*": "./*"
|
|
62
|
+
}
|
|
54
63
|
}
|
|
@@ -31,9 +31,9 @@ import { Container } from '@theia/core/shared/inversify';
|
|
|
31
31
|
import { expect } from 'chai';
|
|
32
32
|
import * as sinon from 'sinon';
|
|
33
33
|
import URI from '@theia/core/lib/common/uri';
|
|
34
|
-
import { CommonVariableContribution } from './common-variable-contribution';
|
|
35
|
-
import { VariableInput } from './variable-input';
|
|
36
|
-
import { VariableRegistry } from './variable';
|
|
34
|
+
import { CommonVariableContribution } from './common-variable-contribution.js';
|
|
35
|
+
import { VariableInput } from './variable-input.js';
|
|
36
|
+
import { VariableRegistry } from './variable.js';
|
|
37
37
|
|
|
38
38
|
disableJSDOM();
|
|
39
39
|
|