Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid using import x = require('...')"

Browse Source 
This reverts commit 7de696a202.

Seems to have broken loading vs/nls in at least one case in insiders
This commit is contained in:
Matt Bierner
2018-03-15 00:46:28 -07:00
parent a9e52b060c
commit 27256832f3
264 changed files with 700 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as nls from 'vs/nls';
import nls = require('vs/nls');
import Severity from 'vs/base/common/severity';
import { Action, IAction } from 'vs/base/common/actions';
import { MainThreadMessageServiceShape, MainContext, IExtHostContext, MainThreadMessageOptions } from '../node/extHost.protocol';
@@ -14,6 +14,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { once } from 'vs/base/common/event';
import { ICommandService } from 'vs/platform/commands/common/commands';
import { localize } from 'vs/nls';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
@extHostNamedCustomer(MainContext.MainThreadMessageService)
@@ -70,11 +71,11 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
let source: string;
if (extension) {
source = nls.localize('extensionSource', "{0} (Extension)", extension.displayName || extension.name);
source = localize('extensionSource', "{0} (Extension)", extension.displayName || extension.name);
}
if (!source) {
source = nls.localize('defaultSource', "Extension");
source = localize('defaultSource', "Extension");
}
const secondaryActions: IAction[] = [];

2
src/vs/workbench/api/node/extHostMessageService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import Severity from 'vs/base/common/severity';
import * as vscode from 'vscode';
import vscode = require('vscode');
import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol';
import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';

2
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as vscode from 'vscode';
import vscode = require('vscode');
import { Event, Emitter } from 'vs/base/common/event';
import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext } from './extHost.protocol';