Skip to content

Commit ca4519a

Browse files
joaomorenojoaomoreno
committed
workbench/electron-main -> code/electron-main
1 parent 8aeb918 commit ca4519a

23 files changed

Lines changed: 71 additions & 58 deletions

‎build/gulpfile.vscode.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ var vscodeEntryPoints = _.flatten([
4343
buildfile.base,
4444
buildfile.editor,
4545
buildfile.languages,
46-
buildfile.vscode
46+
buildfile.workbench,
47+
buildfile.code
4748
]);
4849

4950
var vscodeResources = [

‎src/buildfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
exports.base = require('./vs/base/buildfile').collectModules();
77
exports.editor = require('./vs/editor/buildfile').collectModules();
88
exports.languages = require('./vs/languages/buildfile').collectModules();
9-
exports.vscode = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
9+
exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
10+
exports.code = require('./vs/code/buildfile').collectModules();
1011
exports.standaloneLanguages = require('./vs/editor/standalone-languages/buildfile').collectModules();
1112
exports.standaloneLanguages2 = require('./vs/languages/buildfile-editor-languages').collectModules();
1213

‎src/cli.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
require('./bootstrap-amd').bootstrap('vs/workbench/electron-main/cli');
6+
require('./bootstrap-amd').bootstrap('vs/code/electron-main/cli');

‎src/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function getNLSConfiguration() {
7979
// We have a built version so we have extracted nls file. Try to find
8080
// the right file to use.
8181
while (locale) {
82-
var candidate = path.join(__dirname, 'vs', 'workbench', 'electron-main', 'main.nls.') + locale + '.js';
82+
var candidate = path.join(__dirname, 'vs', 'code', 'electron-main', 'main.nls.') + locale + '.js';
8383
if (fs.existsSync(candidate)) {
8484
return { locale: initialLocale, availableLanguages: { '*': locale } };
8585
} else {
@@ -132,5 +132,5 @@ app.on('open-file', function (event, path) {
132132
app.once('ready', function () {
133133
var nlsConfig = getNLSConfiguration();
134134
process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
135-
require('./bootstrap-amd').bootstrap('vs/workbench/electron-main/main');
135+
require('./bootstrap-amd').bootstrap('vs/code/electron-main/main');
136136
});

‎src/vs/code/buildfile.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
'use strict';
6+
7+
function createModuleDescription(name, exclude) {
8+
var result= {};
9+
var excludes = ['vs/css', 'vs/nls', 'vs/text'];
10+
result.name= name;
11+
if (Array.isArray(exclude) && exclude.length > 0) {
12+
excludes = excludes.concat(exclude);
13+
}
14+
result.exclude= excludes;
15+
return result;
16+
}
17+
18+
exports.collectModules= function() {
19+
return [
20+
createModuleDescription('vs/code/electron-main/main', []),
21+
createModuleDescription('vs/code/electron-main/cli', []),
22+
createModuleDescription('vs/code/electron-main/sharedProcessMain', [])
23+
];
24+
};

src/vs/workbench/electron-main/argv.ts renamed to src/vs/code/electron-main/argv.ts

File renamed without changes.

src/vs/workbench/electron-main/auto-updater.linux.ts renamed to src/vs/code/electron-main/auto-updater.linux.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { isString } from 'vs/base/common/types';
1010
import { Promise } from 'vs/base/common/winjs.base';
1111
import { json } from 'vs/base/node/request';
1212
import { getProxyAgent } from 'vs/base/node/proxy';
13-
import { ISettingsService } from 'vs/workbench/electron-main/settings';
14-
import { IEnvironmentService } from 'vs/workbench/electron-main/env';
13+
import { ISettingsService } from 'vs/code/electron-main/settings';
14+
import { IEnvironmentService } from 'vs/code/electron-main/env';
1515

1616
export interface IUpdate {
1717
url: string;

src/vs/workbench/electron-main/auto-updater.win32.ts renamed to src/vs/code/electron-main/auto-updater.win32.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import { isString } from 'vs/base/common/types';
1515
import { Promise, TPromise } from 'vs/base/common/winjs.base';
1616
import { download, json } from 'vs/base/node/request';
1717
import { getProxyAgent } from 'vs/base/node/proxy';
18-
import { ISettingsService } from 'vs/workbench/electron-main/settings';
19-
import { ILifecycleService } from 'vs/workbench/electron-main/lifecycle';
18+
import { ISettingsService } from 'vs/code/electron-main/settings';
19+
import { ILifecycleService } from 'vs/code/electron-main/lifecycle';
2020
import { IEnvironmentService } from './env';
2121

2222
export interface IUpdate {

src/vs/workbench/electron-main/cli.ts renamed to src/vs/code/electron-main/cli.ts

File renamed without changes.

src/vs/workbench/electron-main/env.ts renamed to src/vs/code/electron-main/env.ts

File renamed without changes.

0 commit comments

Comments
 (0)