ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-20 12:00:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Initial VS Code 1.19 source merge (#571)

Browse Source 
* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/services/mode/common/workbenchModeService.ts
View File

@@ -16,6 +16,7 @@ import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
import { ILanguageExtensionPoint, IValidLanguageExtensionPoint } from 'vs/editor/common/services/modeService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
export const languagesExtPoint: IExtensionPoint<ILanguageExtensionPoint[]> = ExtensionsRegistry.registerExtensionPoint<ILanguageExtensionPoint[]>('languages', [], {
description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'),
@@ -84,9 +85,10 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
constructor(
@IExtensionService extensionService: IExtensionService,
@IConfigurationService configurationService: IConfigurationService
@IConfigurationService configurationService: IConfigurationService,
@IEnvironmentService environmentService: IEnvironmentService
) {
super();
super(environmentService.verbose || environmentService.isExtensionDevelopment || !environmentService.isBuilt);
this._configurationService = configurationService;
this._extensionService = extensionService;
@@ -136,7 +138,7 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
protected _onReady(): TPromise<boolean> {
if (!this._onReadyPromise) {
this._onReadyPromise = this._extensionService.onReady().then(() => {
this._onReadyPromise = this._extensionService.whenInstalledExtensionsRegistered().then(() => {
this.updateMime();
return true;
});
@@ -146,7 +148,7 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
}
private updateMime(): void {
const configuration = this._configurationService.getConfiguration<IFilesConfiguration>();
const configuration = this._configurationService.getValue<IFilesConfiguration>();
// Clear user configured mime associations
mime.clearTextMimes(true /* user configured */);