Skip to content

Commit b457326

Browse files
alexdimaalexdima
committed
Remove no longer used code (due to vs/languages removal)
1 parent 8a6b8fd commit b457326

27 files changed

Lines changed: 44 additions & 1923 deletions

‎build/gulpfile.editor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var editorEntryPoints = [
3030
prepend: [ 'vs/loader.js' ],
3131
append: [ 'vs/base/worker/workerMain' ],
3232
dest: 'vs/base/worker/workerMain.js'
33-
},
33+
}
3434
];
3535

3636
var editorResources = [

‎build/gulpfile.vscode.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ const builtInExtensions = [
4646
const vscodeEntryPoints = _.flatten([
4747
buildfile.entrypoint('vs/workbench/workbench.main'),
4848
buildfile.base,
49-
buildfile.editor,
50-
buildfile.languages,
5149
buildfile.workbench,
5250
buildfile.code
5351
]);
@@ -60,8 +58,6 @@ const vscodeResources = [
6058
'out-build/paths.js',
6159
'out-build/vs/**/*.{svg,png,cur}',
6260
'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh}',
63-
'out-build/vs/base/worker/workerMainCompatibility.html',
64-
'out-build/vs/base/worker/workerMain.{js,js.map}',
6561
'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
6662
'out-build/vs/workbench/browser/media/*-theme.css',
6763
'out-build/vs/workbench/electron-browser/bootstrap/**',

‎src/buildfile.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
exports.base = require('./vs/base/buildfile').collectModules();
7-
exports.editor = require('./vs/editor/buildfile').collectModules();
8-
exports.languages = [];
6+
exports.base = [{
7+
name: 'vs/base/common/worker/simpleWorker',
8+
include: [ 'vs/editor/common/services/editorSimpleWorker' ],
9+
prepend: [ 'vs/loader.js' ],
10+
append: [ 'vs/base/worker/workerMain' ],
11+
dest: 'vs/base/worker/workerMain.js'
12+
}];
913
exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
1014
exports.code = require('./vs/code/buildfile').collectModules();
1115

‎src/vs/base/buildfile.js‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/vs/base/common/worker/simpleWorker.ts‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,38 @@
77
import {transformErrorForSerialization} from 'vs/base/common/errors';
88
import {Disposable} from 'vs/base/common/lifecycle';
99
import {ErrorCallback, TPromise, ValueCallback} from 'vs/base/common/winjs.base';
10-
import {IWorker, IWorkerFactory} from './workerClient';
1110
import {ShallowCancelThenPromise} from 'vs/base/common/async';
11+
import {isWeb} from 'vs/base/common/platform';
1212

1313
const INITIALIZE = '$initialize';
1414

15+
export interface IWorker {
16+
getId():number;
17+
postMessage(message:string):void;
18+
dispose():void;
19+
}
20+
21+
export interface IWorkerCallback {
22+
(message:string):void;
23+
}
24+
25+
export interface IWorkerFactory {
26+
create(moduleId:string, callback:IWorkerCallback, onErrorCallback:(err:any)=>void):IWorker;
27+
}
28+
29+
let webWorkerWarningLogged = false;
30+
export function logOnceWebWorkerWarning(err: any): void {
31+
if (!isWeb) {
32+
// running tests
33+
return;
34+
}
35+
if (!webWorkerWarningLogged) {
36+
webWorkerWarningLogged = true;
37+
console.warn('Could not create web worker(s). Falling back to loading web worker code in main thread, which might cause UI freezes. Please see https://github.com/Microsoft/monaco-editor#faq');
38+
}
39+
console.warn(err.message);
40+
}
41+
1542
interface IMessage {
1643
vsWorker: number;
1744
req?: string;
@@ -308,7 +335,6 @@ export class SimpleWorkerServer {
308335
private initialize(workerId: number, moduleId: string, loaderConfig:any): TPromise<any> {
309336
this._protocol.setWorkerId(workerId);
310337

311-
// TODO@Alex: share this code with workerServer
312338
if (loaderConfig) {
313339
// Remove 'baseUrl', handling it is beyond scope for now
314340
if (typeof loaderConfig.baseUrl !== 'undefined') {

0 commit comments

Comments
 (0)