@codingame/monaco-vscode-environment-service-override 11.1.2 → 12.0.1
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/index.d.ts
CHANGED
|
@@ -1,2 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
|
|
2
|
+
import type { IWorkbenchConstructionOptions } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/browser/web.api";
|
|
3
|
+
/**
|
|
4
|
+
* @deprecated Provide construction option via the services `initialize` function `configuration` parameter
|
|
5
|
+
*/
|
|
6
|
+
declare function getServiceOverride(options: IWorkbenchConstructionOptions): IEditorOverrideServices;
|
|
7
|
+
declare function getServiceOverride(): IEditorOverrideServices;
|
|
8
|
+
export default getServiceOverride;
|
|
9
|
+
export type { IWorkbenchConstructionOptions };
|
package/index.js
CHANGED
|
@@ -1 +1,24 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
3
|
+
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
4
|
+
import { BrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-abed5a84-8a82-5f84-9412-88a736235bae-common/vscode/vs/workbench/services/environment/browser/environmentService';
|
|
5
|
+
import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
|
|
6
|
+
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
7
|
+
import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
|
|
8
|
+
import { logsPath, getWorkspaceIdentifier, getWorkbenchConstructionOptions } from 'vscode/workbench';
|
|
9
|
+
|
|
10
|
+
let InjectedBrowserWorkbenchEnvironmentService = class InjectedBrowserWorkbenchEnvironmentService extends BrowserWorkbenchEnvironmentService {
|
|
11
|
+
constructor(workspaceId = getWorkspaceIdentifier().id, options = getWorkbenchConstructionOptions(), productService) {
|
|
12
|
+
super(workspaceId, logsPath, options, productService);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
InjectedBrowserWorkbenchEnvironmentService = __decorate([
|
|
16
|
+
__param(2, IProductService)
|
|
17
|
+
], InjectedBrowserWorkbenchEnvironmentService);
|
|
18
|
+
function getServiceOverride(options) {
|
|
19
|
+
return {
|
|
20
|
+
[IEnvironmentService.toString()]: new SyncDescriptor(InjectedBrowserWorkbenchEnvironmentService, [undefined, options], true)
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export { getServiceOverride as default };
|
package/package.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-environment-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "12.0.1",
|
|
4
|
+
"private": false,
|
|
5
|
+
"description": "VSCode public API plugged on the monaco editor - environment service-override",
|
|
4
6
|
"keywords": [],
|
|
5
7
|
"author": {
|
|
6
8
|
"name": "CodinGame",
|
|
@@ -12,8 +14,18 @@
|
|
|
12
14
|
"url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
|
|
13
15
|
},
|
|
14
16
|
"type": "module",
|
|
15
|
-
"
|
|
16
|
-
|
|
17
|
+
"dependencies": {
|
|
18
|
+
"@codingame/monaco-vscode-abed5a84-8a82-5f84-9412-88a736235bae-common": "12.0.1",
|
|
19
|
+
"vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
|
|
20
|
+
},
|
|
21
|
+
"peerDependencies": {
|
|
22
|
+
"@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": "12.0.1"
|
|
23
|
+
},
|
|
24
|
+
"peerDependenciesMeta": {
|
|
25
|
+
"@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": {
|
|
26
|
+
"optional": true
|
|
27
|
+
}
|
|
28
|
+
},
|
|
17
29
|
"main": "index.js",
|
|
18
30
|
"module": "index.js",
|
|
19
31
|
"types": "index.d.ts",
|
|
@@ -22,10 +34,12 @@
|
|
|
22
34
|
"default": "./index.js"
|
|
23
35
|
},
|
|
24
36
|
"./vscode/*": {
|
|
25
|
-
"default": "./vscode/src/*.js"
|
|
37
|
+
"default": "./vscode/src/*.js",
|
|
38
|
+
"types": "./vscode/src/*.d.ts"
|
|
39
|
+
},
|
|
40
|
+
"./*": {
|
|
41
|
+
"default": "./*.js",
|
|
42
|
+
"types": "./*.d.ts"
|
|
26
43
|
}
|
|
27
|
-
},
|
|
28
|
-
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
|
|
30
44
|
}
|
|
31
45
|
}
|
package/environment.js
DELETED
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
|
|
3
|
-
import { BrowserWorkbenchEnvironmentService } from './vscode/src/vs/workbench/services/environment/browser/environmentService.js';
|
|
4
|
-
import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
|
|
5
|
-
import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
|
|
6
|
-
import { logsPath, getWorkspaceIdentifier, getWorkbenchConstructionOptions } from 'vscode/workbench';
|
|
7
|
-
|
|
8
|
-
let InjectedBrowserWorkbenchEnvironmentService = class InjectedBrowserWorkbenchEnvironmentService extends BrowserWorkbenchEnvironmentService {
|
|
9
|
-
constructor(workspaceId = getWorkspaceIdentifier().id, options = getWorkbenchConstructionOptions(), productService) {
|
|
10
|
-
super(workspaceId, logsPath, options, productService);
|
|
11
|
-
}
|
|
12
|
-
};
|
|
13
|
-
InjectedBrowserWorkbenchEnvironmentService = __decorate([
|
|
14
|
-
( __param(2, IProductService))
|
|
15
|
-
], InjectedBrowserWorkbenchEnvironmentService);
|
|
16
|
-
function getServiceOverride(options) {
|
|
17
|
-
return {
|
|
18
|
-
[( IEnvironmentService.toString())]: new SyncDescriptor(InjectedBrowserWorkbenchEnvironmentService, [undefined, options], true)
|
|
19
|
-
};
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export { getServiceOverride as default };
|
|
@@ -1,377 +0,0 @@
|
|
|
1
|
-
import { __decorate } from 'vscode/external/tslib/tslib.es6.js';
|
|
2
|
-
import { Schemas } from 'vscode/vscode/vs/base/common/network';
|
|
3
|
-
import { joinPath } from 'vscode/vscode/vs/base/common/resources';
|
|
4
|
-
import { URI } from 'vscode/vscode/vs/base/common/uri';
|
|
5
|
-
import { memoize } from 'vscode/vscode/vs/base/common/decorators';
|
|
6
|
-
import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
|
|
7
|
-
import { parseLineAndColumnAware } from 'vscode/vscode/vs/base/common/extpath';
|
|
8
|
-
import { LogLevelToString } from 'vscode/vscode/vs/platform/log/common/log';
|
|
9
|
-
import { isUndefined } from 'vscode/vscode/vs/base/common/types';
|
|
10
|
-
import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from 'vscode/vscode/vs/platform/environment/common/environmentService';
|
|
11
|
-
|
|
12
|
-
class BrowserWorkbenchEnvironmentService {
|
|
13
|
-
get remoteAuthority() { return this.options.remoteAuthority; }
|
|
14
|
-
get expectsResolverExtension() {
|
|
15
|
-
return !!this.options.remoteAuthority?.includes('+') && !this.options.webSocketFactory;
|
|
16
|
-
}
|
|
17
|
-
get isBuilt() { return !!this.productService.commit; }
|
|
18
|
-
get logLevel() {
|
|
19
|
-
const logLevelFromPayload = this.payload?.get('logLevel');
|
|
20
|
-
if (logLevelFromPayload) {
|
|
21
|
-
return logLevelFromPayload.split(',').find(entry => !EXTENSION_IDENTIFIER_WITH_LOG_REGEX.test(entry));
|
|
22
|
-
}
|
|
23
|
-
return this.options.developmentOptions?.logLevel !== undefined ? LogLevelToString(this.options.developmentOptions?.logLevel) : undefined;
|
|
24
|
-
}
|
|
25
|
-
get extensionLogLevel() {
|
|
26
|
-
const logLevelFromPayload = this.payload?.get('logLevel');
|
|
27
|
-
if (logLevelFromPayload) {
|
|
28
|
-
const result = [];
|
|
29
|
-
for (const entry of logLevelFromPayload.split(',')) {
|
|
30
|
-
const matches = EXTENSION_IDENTIFIER_WITH_LOG_REGEX.exec(entry);
|
|
31
|
-
if (matches && matches[1] && matches[2]) {
|
|
32
|
-
result.push([matches[1], matches[2]]);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
return result.length ? result : undefined;
|
|
36
|
-
}
|
|
37
|
-
return this.options.developmentOptions?.extensionLogLevel !== undefined ? this.options.developmentOptions?.extensionLogLevel.map(([extension, logLevel]) => ([extension, LogLevelToString(logLevel)])) : undefined;
|
|
38
|
-
}
|
|
39
|
-
get profDurationMarkers() {
|
|
40
|
-
const profDurationMarkersFromPayload = this.payload?.get('profDurationMarkers');
|
|
41
|
-
if (profDurationMarkersFromPayload) {
|
|
42
|
-
const result = [];
|
|
43
|
-
for (const entry of profDurationMarkersFromPayload.split(',')) {
|
|
44
|
-
result.push(entry);
|
|
45
|
-
}
|
|
46
|
-
return result.length === 2 ? result : undefined;
|
|
47
|
-
}
|
|
48
|
-
return undefined;
|
|
49
|
-
}
|
|
50
|
-
get windowLogsPath() { return this.logsHome; }
|
|
51
|
-
get logFile() { return joinPath(this.windowLogsPath, 'window.log'); }
|
|
52
|
-
get userRoamingDataHome() { return URI.file('/User').with({ scheme: Schemas.vscodeUserData }); }
|
|
53
|
-
get argvResource() { return joinPath(this.userRoamingDataHome, 'argv.json'); }
|
|
54
|
-
get cacheHome() { return joinPath(this.userRoamingDataHome, 'caches'); }
|
|
55
|
-
get workspaceStorageHome() { return joinPath(this.userRoamingDataHome, 'workspaceStorage'); }
|
|
56
|
-
get localHistoryHome() { return joinPath(this.userRoamingDataHome, 'History'); }
|
|
57
|
-
get stateResource() { return joinPath(this.userRoamingDataHome, 'State', 'storage.json'); }
|
|
58
|
-
get userDataSyncHome() { return joinPath(this.userRoamingDataHome, 'sync', this.workspaceId); }
|
|
59
|
-
get sync() { return undefined; }
|
|
60
|
-
get keyboardLayoutResource() { return joinPath(this.userRoamingDataHome, 'keyboardLayout.json'); }
|
|
61
|
-
get untitledWorkspacesHome() { return joinPath(this.userRoamingDataHome, 'Workspaces'); }
|
|
62
|
-
get serviceMachineIdResource() { return joinPath(this.userRoamingDataHome, 'machineid'); }
|
|
63
|
-
get extHostLogsPath() { return joinPath(this.logsHome, 'exthost'); }
|
|
64
|
-
get extHostTelemetryLogFile() {
|
|
65
|
-
return joinPath(this.extHostLogsPath, 'extensionTelemetry.log');
|
|
66
|
-
}
|
|
67
|
-
get debugExtensionHost() {
|
|
68
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
69
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
70
|
-
}
|
|
71
|
-
return this.extensionHostDebugEnvironment.params;
|
|
72
|
-
}
|
|
73
|
-
get isExtensionDevelopment() {
|
|
74
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
75
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
76
|
-
}
|
|
77
|
-
return this.extensionHostDebugEnvironment.isExtensionDevelopment;
|
|
78
|
-
}
|
|
79
|
-
get extensionDevelopmentLocationURI() {
|
|
80
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
81
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
82
|
-
}
|
|
83
|
-
return this.extensionHostDebugEnvironment.extensionDevelopmentLocationURI;
|
|
84
|
-
}
|
|
85
|
-
get extensionDevelopmentLocationKind() {
|
|
86
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
87
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
88
|
-
}
|
|
89
|
-
return this.extensionHostDebugEnvironment.extensionDevelopmentKind;
|
|
90
|
-
}
|
|
91
|
-
get extensionTestsLocationURI() {
|
|
92
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
93
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
94
|
-
}
|
|
95
|
-
return this.extensionHostDebugEnvironment.extensionTestsLocationURI;
|
|
96
|
-
}
|
|
97
|
-
get extensionEnabledProposedApi() {
|
|
98
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
99
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
100
|
-
}
|
|
101
|
-
return this.extensionHostDebugEnvironment.extensionEnabledProposedApi;
|
|
102
|
-
}
|
|
103
|
-
get debugRenderer() {
|
|
104
|
-
if (!this.extensionHostDebugEnvironment) {
|
|
105
|
-
this.extensionHostDebugEnvironment = this.resolveExtensionHostDebugEnvironment();
|
|
106
|
-
}
|
|
107
|
-
return this.extensionHostDebugEnvironment.debugRenderer;
|
|
108
|
-
}
|
|
109
|
-
get enableSmokeTestDriver() { return this.options.developmentOptions?.enableSmokeTestDriver; }
|
|
110
|
-
get disableExtensions() { return this.payload?.get('disableExtensions') === 'true'; }
|
|
111
|
-
get enableExtensions() { return this.options.enabledExtensions; }
|
|
112
|
-
get webviewExternalEndpoint() {
|
|
113
|
-
const endpoint = this.options.webviewEndpoint
|
|
114
|
-
|| this.productService.webviewContentExternalBaseUrlTemplate
|
|
115
|
-
|| 'https://{{uuid}}.vscode-cdn.net/{{quality}}/{{commit}}/out/vs/workbench/contrib/webview/browser/pre/';
|
|
116
|
-
const webviewExternalEndpointCommit = this.payload?.get('webviewExternalEndpointCommit');
|
|
117
|
-
return endpoint
|
|
118
|
-
.replace('{{commit}}', webviewExternalEndpointCommit ?? this.productService.commit ?? 'ef65ac1ba57f57f2a3961bfe94aa20481caca4c6')
|
|
119
|
-
.replace('{{quality}}', (webviewExternalEndpointCommit ? 'insider' : this.productService.quality) ?? 'insider');
|
|
120
|
-
}
|
|
121
|
-
get extensionTelemetryLogResource() { return joinPath(this.logsHome, 'extensionTelemetry.log'); }
|
|
122
|
-
get disableTelemetry() { return false; }
|
|
123
|
-
get verbose() { return this.payload?.get('verbose') === 'true'; }
|
|
124
|
-
get logExtensionHostCommunication() { return this.payload?.get('logExtensionHostCommunication') === 'true'; }
|
|
125
|
-
get skipReleaseNotes() { return this.payload?.get('skipReleaseNotes') === 'true'; }
|
|
126
|
-
get skipWelcome() { return this.payload?.get('skipWelcome') === 'true'; }
|
|
127
|
-
get disableWorkspaceTrust() { return !this.options.enableWorkspaceTrust; }
|
|
128
|
-
get profile() { return this.payload?.get('profile'); }
|
|
129
|
-
constructor(workspaceId, logsHome, options, productService) {
|
|
130
|
-
this.workspaceId = workspaceId;
|
|
131
|
-
this.logsHome = logsHome;
|
|
132
|
-
this.options = options;
|
|
133
|
-
this.productService = productService;
|
|
134
|
-
this.extensionHostDebugEnvironment = undefined;
|
|
135
|
-
this.editSessionId = this.options.editSessionId;
|
|
136
|
-
if (options.workspaceProvider && Array.isArray(options.workspaceProvider.payload)) {
|
|
137
|
-
try {
|
|
138
|
-
this.payload = ( new Map(options.workspaceProvider.payload));
|
|
139
|
-
}
|
|
140
|
-
catch (error) {
|
|
141
|
-
onUnexpectedError(error);
|
|
142
|
-
}
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
resolveExtensionHostDebugEnvironment() {
|
|
146
|
-
const extensionHostDebugEnvironment = {
|
|
147
|
-
params: {
|
|
148
|
-
port: null,
|
|
149
|
-
break: false
|
|
150
|
-
},
|
|
151
|
-
debugRenderer: false,
|
|
152
|
-
isExtensionDevelopment: false,
|
|
153
|
-
extensionDevelopmentLocationURI: undefined,
|
|
154
|
-
extensionDevelopmentKind: undefined
|
|
155
|
-
};
|
|
156
|
-
if (this.payload) {
|
|
157
|
-
for (const [key, value] of this.payload) {
|
|
158
|
-
switch (key) {
|
|
159
|
-
case 'extensionDevelopmentPath':
|
|
160
|
-
if (!extensionHostDebugEnvironment.extensionDevelopmentLocationURI) {
|
|
161
|
-
extensionHostDebugEnvironment.extensionDevelopmentLocationURI = [];
|
|
162
|
-
}
|
|
163
|
-
extensionHostDebugEnvironment.extensionDevelopmentLocationURI.push(( URI.parse(value)));
|
|
164
|
-
extensionHostDebugEnvironment.isExtensionDevelopment = true;
|
|
165
|
-
break;
|
|
166
|
-
case 'extensionDevelopmentKind':
|
|
167
|
-
extensionHostDebugEnvironment.extensionDevelopmentKind = [value];
|
|
168
|
-
break;
|
|
169
|
-
case 'extensionTestsPath':
|
|
170
|
-
extensionHostDebugEnvironment.extensionTestsLocationURI = ( URI.parse(value));
|
|
171
|
-
break;
|
|
172
|
-
case 'debugRenderer':
|
|
173
|
-
extensionHostDebugEnvironment.debugRenderer = value === 'true';
|
|
174
|
-
break;
|
|
175
|
-
case 'debugId':
|
|
176
|
-
extensionHostDebugEnvironment.params.debugId = value;
|
|
177
|
-
break;
|
|
178
|
-
case 'inspect-brk-extensions':
|
|
179
|
-
extensionHostDebugEnvironment.params.port = parseInt(value);
|
|
180
|
-
extensionHostDebugEnvironment.params.break = true;
|
|
181
|
-
break;
|
|
182
|
-
case 'inspect-extensions':
|
|
183
|
-
extensionHostDebugEnvironment.params.port = parseInt(value);
|
|
184
|
-
break;
|
|
185
|
-
case 'enableProposedApi':
|
|
186
|
-
extensionHostDebugEnvironment.extensionEnabledProposedApi = [];
|
|
187
|
-
break;
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
const developmentOptions = this.options.developmentOptions;
|
|
192
|
-
if (developmentOptions && !extensionHostDebugEnvironment.isExtensionDevelopment) {
|
|
193
|
-
if (developmentOptions.extensions?.length) {
|
|
194
|
-
extensionHostDebugEnvironment.extensionDevelopmentLocationURI = ( developmentOptions.extensions.map(e => URI.revive(e)));
|
|
195
|
-
extensionHostDebugEnvironment.isExtensionDevelopment = true;
|
|
196
|
-
}
|
|
197
|
-
if (developmentOptions.extensionTestsPath) {
|
|
198
|
-
extensionHostDebugEnvironment.extensionTestsLocationURI = URI.revive(developmentOptions.extensionTestsPath);
|
|
199
|
-
}
|
|
200
|
-
}
|
|
201
|
-
return extensionHostDebugEnvironment;
|
|
202
|
-
}
|
|
203
|
-
get filesToOpenOrCreate() {
|
|
204
|
-
if (this.payload) {
|
|
205
|
-
const fileToOpen = this.payload.get('openFile');
|
|
206
|
-
if (fileToOpen) {
|
|
207
|
-
const fileUri = ( URI.parse(fileToOpen));
|
|
208
|
-
if (( this.payload.has('gotoLineMode'))) {
|
|
209
|
-
const pathColumnAware = parseLineAndColumnAware(fileUri.path);
|
|
210
|
-
return [{
|
|
211
|
-
fileUri: fileUri.with({ path: pathColumnAware.path }),
|
|
212
|
-
options: {
|
|
213
|
-
selection: !isUndefined(pathColumnAware.line) ? { startLineNumber: pathColumnAware.line, startColumn: pathColumnAware.column || 1 } : undefined
|
|
214
|
-
}
|
|
215
|
-
}];
|
|
216
|
-
}
|
|
217
|
-
return [{ fileUri }];
|
|
218
|
-
}
|
|
219
|
-
}
|
|
220
|
-
return undefined;
|
|
221
|
-
}
|
|
222
|
-
get filesToDiff() {
|
|
223
|
-
if (this.payload) {
|
|
224
|
-
const fileToDiffPrimary = this.payload.get('diffFilePrimary');
|
|
225
|
-
const fileToDiffSecondary = this.payload.get('diffFileSecondary');
|
|
226
|
-
if (fileToDiffPrimary && fileToDiffSecondary) {
|
|
227
|
-
return [
|
|
228
|
-
{ fileUri: ( URI.parse(fileToDiffSecondary)) },
|
|
229
|
-
{ fileUri: ( URI.parse(fileToDiffPrimary)) }
|
|
230
|
-
];
|
|
231
|
-
}
|
|
232
|
-
}
|
|
233
|
-
return undefined;
|
|
234
|
-
}
|
|
235
|
-
get filesToMerge() {
|
|
236
|
-
if (this.payload) {
|
|
237
|
-
const fileToMerge1 = this.payload.get('mergeFile1');
|
|
238
|
-
const fileToMerge2 = this.payload.get('mergeFile2');
|
|
239
|
-
const fileToMergeBase = this.payload.get('mergeFileBase');
|
|
240
|
-
const fileToMergeResult = this.payload.get('mergeFileResult');
|
|
241
|
-
if (fileToMerge1 && fileToMerge2 && fileToMergeBase && fileToMergeResult) {
|
|
242
|
-
return [
|
|
243
|
-
{ fileUri: ( URI.parse(fileToMerge1)) },
|
|
244
|
-
{ fileUri: ( URI.parse(fileToMerge2)) },
|
|
245
|
-
{ fileUri: ( URI.parse(fileToMergeBase)) },
|
|
246
|
-
{ fileUri: ( URI.parse(fileToMergeResult)) }
|
|
247
|
-
];
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
return undefined;
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
254
|
-
memoize
|
|
255
|
-
], BrowserWorkbenchEnvironmentService.prototype, "remoteAuthority", null));
|
|
256
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
257
|
-
memoize
|
|
258
|
-
], BrowserWorkbenchEnvironmentService.prototype, "expectsResolverExtension", null));
|
|
259
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
260
|
-
memoize
|
|
261
|
-
], BrowserWorkbenchEnvironmentService.prototype, "isBuilt", null));
|
|
262
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
263
|
-
memoize
|
|
264
|
-
], BrowserWorkbenchEnvironmentService.prototype, "logLevel", null));
|
|
265
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
266
|
-
memoize
|
|
267
|
-
], BrowserWorkbenchEnvironmentService.prototype, "windowLogsPath", null));
|
|
268
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
269
|
-
memoize
|
|
270
|
-
], BrowserWorkbenchEnvironmentService.prototype, "logFile", null));
|
|
271
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
272
|
-
memoize
|
|
273
|
-
], BrowserWorkbenchEnvironmentService.prototype, "userRoamingDataHome", null));
|
|
274
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
275
|
-
memoize
|
|
276
|
-
], BrowserWorkbenchEnvironmentService.prototype, "argvResource", null));
|
|
277
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
278
|
-
memoize
|
|
279
|
-
], BrowserWorkbenchEnvironmentService.prototype, "cacheHome", null));
|
|
280
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
281
|
-
memoize
|
|
282
|
-
], BrowserWorkbenchEnvironmentService.prototype, "workspaceStorageHome", null));
|
|
283
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
284
|
-
memoize
|
|
285
|
-
], BrowserWorkbenchEnvironmentService.prototype, "localHistoryHome", null));
|
|
286
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
287
|
-
memoize
|
|
288
|
-
], BrowserWorkbenchEnvironmentService.prototype, "stateResource", null));
|
|
289
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
290
|
-
memoize
|
|
291
|
-
], BrowserWorkbenchEnvironmentService.prototype, "userDataSyncHome", null));
|
|
292
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
293
|
-
memoize
|
|
294
|
-
], BrowserWorkbenchEnvironmentService.prototype, "sync", null));
|
|
295
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
296
|
-
memoize
|
|
297
|
-
], BrowserWorkbenchEnvironmentService.prototype, "keyboardLayoutResource", null));
|
|
298
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
299
|
-
memoize
|
|
300
|
-
], BrowserWorkbenchEnvironmentService.prototype, "untitledWorkspacesHome", null));
|
|
301
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
302
|
-
memoize
|
|
303
|
-
], BrowserWorkbenchEnvironmentService.prototype, "serviceMachineIdResource", null));
|
|
304
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
305
|
-
memoize
|
|
306
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extHostLogsPath", null));
|
|
307
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
308
|
-
memoize
|
|
309
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extHostTelemetryLogFile", null));
|
|
310
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
311
|
-
memoize
|
|
312
|
-
], BrowserWorkbenchEnvironmentService.prototype, "debugExtensionHost", null));
|
|
313
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
314
|
-
memoize
|
|
315
|
-
], BrowserWorkbenchEnvironmentService.prototype, "isExtensionDevelopment", null));
|
|
316
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
317
|
-
memoize
|
|
318
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extensionDevelopmentLocationURI", null));
|
|
319
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
320
|
-
memoize
|
|
321
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extensionDevelopmentLocationKind", null));
|
|
322
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
323
|
-
memoize
|
|
324
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extensionTestsLocationURI", null));
|
|
325
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
326
|
-
memoize
|
|
327
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extensionEnabledProposedApi", null));
|
|
328
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
329
|
-
memoize
|
|
330
|
-
], BrowserWorkbenchEnvironmentService.prototype, "debugRenderer", null));
|
|
331
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
332
|
-
memoize
|
|
333
|
-
], BrowserWorkbenchEnvironmentService.prototype, "enableSmokeTestDriver", null));
|
|
334
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
335
|
-
memoize
|
|
336
|
-
], BrowserWorkbenchEnvironmentService.prototype, "disableExtensions", null));
|
|
337
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
338
|
-
memoize
|
|
339
|
-
], BrowserWorkbenchEnvironmentService.prototype, "enableExtensions", null));
|
|
340
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
341
|
-
memoize
|
|
342
|
-
], BrowserWorkbenchEnvironmentService.prototype, "webviewExternalEndpoint", null));
|
|
343
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
344
|
-
memoize
|
|
345
|
-
], BrowserWorkbenchEnvironmentService.prototype, "extensionTelemetryLogResource", null));
|
|
346
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
347
|
-
memoize
|
|
348
|
-
], BrowserWorkbenchEnvironmentService.prototype, "disableTelemetry", null));
|
|
349
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
350
|
-
memoize
|
|
351
|
-
], BrowserWorkbenchEnvironmentService.prototype, "verbose", null));
|
|
352
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
353
|
-
memoize
|
|
354
|
-
], BrowserWorkbenchEnvironmentService.prototype, "logExtensionHostCommunication", null));
|
|
355
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
356
|
-
memoize
|
|
357
|
-
], BrowserWorkbenchEnvironmentService.prototype, "skipReleaseNotes", null));
|
|
358
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
359
|
-
memoize
|
|
360
|
-
], BrowserWorkbenchEnvironmentService.prototype, "skipWelcome", null));
|
|
361
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
362
|
-
memoize
|
|
363
|
-
], BrowserWorkbenchEnvironmentService.prototype, "disableWorkspaceTrust", null));
|
|
364
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
365
|
-
memoize
|
|
366
|
-
], BrowserWorkbenchEnvironmentService.prototype, "profile", null));
|
|
367
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
368
|
-
memoize
|
|
369
|
-
], BrowserWorkbenchEnvironmentService.prototype, "filesToOpenOrCreate", null));
|
|
370
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
371
|
-
memoize
|
|
372
|
-
], BrowserWorkbenchEnvironmentService.prototype, "filesToDiff", null));
|
|
373
|
-
BrowserWorkbenchEnvironmentService.__decorator = ( __decorate([
|
|
374
|
-
memoize
|
|
375
|
-
], BrowserWorkbenchEnvironmentService.prototype, "filesToMerge", null));
|
|
376
|
-
|
|
377
|
-
export { BrowserWorkbenchEnvironmentService };
|