@theia/external-terminal 1.65.0-next.19 → 1.65.0-next.28
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/electron-browser/external-terminal-preference.d.ts +2 -3
- package/lib/electron-browser/external-terminal-preference.d.ts.map +1 -1
- package/lib/electron-browser/external-terminal-preference.js +5 -7
- package/lib/electron-browser/external-terminal-preference.js.map +1 -1
- package/package.json +5 -5
- package/src/electron-browser/external-terminal-preference.ts +4 -7
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
-
import { PreferenceSchema, PreferenceProxy } from '@theia/core/lib/browser';
|
|
3
|
-
import { PreferenceSchemaProvider } from '@theia/core/lib/browser/preferences/preference-contribution';
|
|
4
2
|
import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
|
|
3
|
+
import { PreferenceProxy, PreferenceSchema, PreferenceSchemaService } from '@theia/core';
|
|
5
4
|
export declare const ExternalTerminalPreferences: unique symbol;
|
|
6
5
|
export type ExternalTerminalPreferences = PreferenceProxy<ExternalTerminalConfiguration>;
|
|
7
6
|
export declare const ExternalTerminalSchemaProvider: unique symbol;
|
|
@@ -9,7 +8,7 @@ export type ExternalTerminalSchemaProvider = () => Promise<PreferenceSchema>;
|
|
|
9
8
|
export declare function bindExternalTerminalPreferences(bind: interfaces.Bind): void;
|
|
10
9
|
export declare class ExternalTerminalPreferenceService {
|
|
11
10
|
protected readonly preferences: ExternalTerminalPreferences;
|
|
12
|
-
protected readonly preferenceSchemaProvider:
|
|
11
|
+
protected readonly preferenceSchemaProvider: PreferenceSchemaService;
|
|
13
12
|
protected readonly promisedSchema: ExternalTerminalSchemaProvider;
|
|
14
13
|
protected init(): void;
|
|
15
14
|
protected doInit(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-terminal-preference.d.ts","sourceRoot":"","sources":["../../src/electron-browser/external-terminal-preference.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"external-terminal-preference.d.ts","sourceRoot":"","sources":["../../src/electron-browser/external-terminal-preference.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAiB,MAAM,8BAA8B,CAAC;AAE7F,OAAO,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAErG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAA0B,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEjH,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AACjF,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC,6BAA6B,CAAC,CAAC;AAEzF,eAAO,MAAM,8BAA8B,eAA0C,CAAC;AACtF,MAAM,MAAM,8BAA8B,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE7E,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAc3E;AAED,qBACa,iCAAiC;IAG1C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,2BAA2B,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,8BAA8B,CAAC;IAGlE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;OAEG;IACH,gCAAgC,IAAI,6BAA6B;CAOpE;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAsB3H"}
|
|
@@ -18,11 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.getExternalTerminalSchema = exports.ExternalTerminalPreferenceService = exports.bindExternalTerminalPreferences = exports.ExternalTerminalSchemaProvider = exports.ExternalTerminalPreferences = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
-
const injectable_preference_proxy_1 = require("@theia/core/lib/browser/preferences/injectable-preference-proxy");
|
|
22
|
-
const preference_contribution_1 = require("@theia/core/lib/browser/preferences/preference-contribution");
|
|
23
21
|
const os_1 = require("@theia/core/lib/common/os");
|
|
24
22
|
const external_terminal_1 = require("../common/external-terminal");
|
|
25
23
|
const nls_1 = require("@theia/core/lib/common/nls");
|
|
24
|
+
const core_1 = require("@theia/core");
|
|
26
25
|
exports.ExternalTerminalPreferences = Symbol('ExternalTerminalPreferences');
|
|
27
26
|
exports.ExternalTerminalSchemaProvider = Symbol('ExternalTerminalSchemaPromise');
|
|
28
27
|
function bindExternalTerminalPreferences(bind) {
|
|
@@ -34,7 +33,7 @@ function bindExternalTerminalPreferences(bind) {
|
|
|
34
33
|
});
|
|
35
34
|
bind(exports.ExternalTerminalPreferences)
|
|
36
35
|
.toDynamicValue(ctx => {
|
|
37
|
-
const factory = ctx.container.get(
|
|
36
|
+
const factory = ctx.container.get(core_1.PreferenceProxyFactory);
|
|
38
37
|
const schemaProvider = ctx.container.get(exports.ExternalTerminalSchemaProvider);
|
|
39
38
|
return factory(schemaProvider());
|
|
40
39
|
})
|
|
@@ -46,7 +45,7 @@ let ExternalTerminalPreferenceService = class ExternalTerminalPreferenceService
|
|
|
46
45
|
this.doInit();
|
|
47
46
|
}
|
|
48
47
|
async doInit() {
|
|
49
|
-
this.preferenceSchemaProvider.
|
|
48
|
+
this.preferenceSchemaProvider.addSchema(await this.promisedSchema());
|
|
50
49
|
}
|
|
51
50
|
/**
|
|
52
51
|
* Get the external terminal configurations from preferences.
|
|
@@ -65,8 +64,8 @@ tslib_1.__decorate([
|
|
|
65
64
|
tslib_1.__metadata("design:type", Object)
|
|
66
65
|
], ExternalTerminalPreferenceService.prototype, "preferences", void 0);
|
|
67
66
|
tslib_1.__decorate([
|
|
68
|
-
(0, inversify_1.inject)(
|
|
69
|
-
tslib_1.__metadata("design:type",
|
|
67
|
+
(0, inversify_1.inject)(core_1.PreferenceSchemaService),
|
|
68
|
+
tslib_1.__metadata("design:type", Object)
|
|
70
69
|
], ExternalTerminalPreferenceService.prototype, "preferenceSchemaProvider", void 0);
|
|
71
70
|
tslib_1.__decorate([
|
|
72
71
|
(0, inversify_1.inject)(exports.ExternalTerminalSchemaProvider),
|
|
@@ -90,7 +89,6 @@ exports.ExternalTerminalPreferenceService = ExternalTerminalPreferenceService =
|
|
|
90
89
|
async function getExternalTerminalSchema(externalTerminalService) {
|
|
91
90
|
const hostExec = await externalTerminalService.getDefaultExec();
|
|
92
91
|
return {
|
|
93
|
-
type: 'object',
|
|
94
92
|
properties: {
|
|
95
93
|
'terminal.external.windowsExec': {
|
|
96
94
|
type: 'string',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-terminal-preference.js","sourceRoot":"","sources":["../../src/electron-browser/external-terminal-preference.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;;;;AAEhF,4DAA6F;
|
|
1
|
+
{"version":3,"file":"external-terminal-preference.js","sourceRoot":"","sources":["../../src/electron-browser/external-terminal-preference.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/external-terminal",
|
|
3
|
-
"version": "1.65.0-next.
|
|
3
|
+
"version": "1.65.0-next.28+7c6aec352",
|
|
4
4
|
"description": "Theia - External Terminal Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.65.0-next.
|
|
7
|
-
"@theia/editor": "1.65.0-next.
|
|
8
|
-
"@theia/workspace": "1.65.0-next.
|
|
6
|
+
"@theia/core": "1.65.0-next.28+7c6aec352",
|
|
7
|
+
"@theia/editor": "1.65.0-next.28+7c6aec352",
|
|
8
|
+
"@theia/workspace": "1.65.0-next.28+7c6aec352",
|
|
9
9
|
"tslib": "^2.6.2"
|
|
10
10
|
},
|
|
11
11
|
"publishConfig": {
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"nyc": {
|
|
48
48
|
"extends": "../../configs/nyc.json"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "7c6aec3525bb27b346e55cd46899d6b82145f6bd"
|
|
51
51
|
}
|
|
@@ -15,12 +15,10 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
-
import { PreferenceSchema, PreferenceProxy } from '@theia/core/lib/browser';
|
|
19
|
-
import { PreferenceProxyFactory } from '@theia/core/lib/browser/preferences/injectable-preference-proxy';
|
|
20
|
-
import { PreferenceSchemaProvider } from '@theia/core/lib/browser/preferences/preference-contribution';
|
|
21
18
|
import { isWindows, isOSX } from '@theia/core/lib/common/os';
|
|
22
19
|
import { ExternalTerminalService, ExternalTerminalConfiguration } from '../common/external-terminal';
|
|
23
20
|
import { nls } from '@theia/core/lib/common/nls';
|
|
21
|
+
import { PreferenceProxy, PreferenceSchema, PreferenceProxyFactory, PreferenceSchemaService } from '@theia/core';
|
|
24
22
|
|
|
25
23
|
export const ExternalTerminalPreferences = Symbol('ExternalTerminalPreferences');
|
|
26
24
|
export type ExternalTerminalPreferences = PreferenceProxy<ExternalTerminalConfiguration>;
|
|
@@ -50,8 +48,8 @@ export class ExternalTerminalPreferenceService {
|
|
|
50
48
|
@inject(ExternalTerminalPreferences)
|
|
51
49
|
protected readonly preferences: ExternalTerminalPreferences;
|
|
52
50
|
|
|
53
|
-
@inject(
|
|
54
|
-
protected readonly preferenceSchemaProvider:
|
|
51
|
+
@inject(PreferenceSchemaService)
|
|
52
|
+
protected readonly preferenceSchemaProvider: PreferenceSchemaService;
|
|
55
53
|
|
|
56
54
|
@inject(ExternalTerminalSchemaProvider)
|
|
57
55
|
protected readonly promisedSchema: ExternalTerminalSchemaProvider;
|
|
@@ -62,7 +60,7 @@ export class ExternalTerminalPreferenceService {
|
|
|
62
60
|
}
|
|
63
61
|
|
|
64
62
|
protected async doInit(): Promise<void> {
|
|
65
|
-
this.preferenceSchemaProvider.
|
|
63
|
+
this.preferenceSchemaProvider.addSchema(await this.promisedSchema());
|
|
66
64
|
}
|
|
67
65
|
|
|
68
66
|
/**
|
|
@@ -86,7 +84,6 @@ export class ExternalTerminalPreferenceService {
|
|
|
86
84
|
export async function getExternalTerminalSchema(externalTerminalService: ExternalTerminalService): Promise<PreferenceSchema> {
|
|
87
85
|
const hostExec = await externalTerminalService.getDefaultExec();
|
|
88
86
|
return {
|
|
89
|
-
type: 'object',
|
|
90
87
|
properties: {
|
|
91
88
|
'terminal.external.windowsExec': {
|
|
92
89
|
type: 'string',
|