ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refresh master with initial release/0.24 snapshot (#332)

Browse Source 
* Initial port of release/0.24 source code

* Fix additional headers

* Fix a typo in launch.json
This commit is contained in:
Karl Burtram
2017-12-15 15:38:57 -08:00
committed by GitHub
parent 271b3a0b82
commit 6ad0df0e3e
7118 changed files with 107999 additions and 56466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import * as paths from 'vs/base/common/paths';
import { TPromise } from 'vs/base/common/winjs.base';
import mime = require('vs/base/common/mime');
import { IFilesConfiguration } from 'vs/platform/files/common/files';
import { IFilesConfiguration, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
import { IExtensionPointUser, ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
@@ -123,7 +123,11 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
});
this._configurationService.onDidUpdateConfiguration(e => this.onConfigurationChange(this._configurationService.getConfiguration<IFilesConfiguration>()));
this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(FILES_ASSOCIATIONS_CONFIG)) {
this.updateMime();
}
});
this.onDidCreateMode((mode) => {
this._extensionService.activateByEvent(`onLanguage:${mode.getId()}`).done(null, onUnexpectedError);
@@ -132,10 +136,8 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
protected _onReady(): TPromise<boolean> {
if (!this._onReadyPromise) {
const configuration = this._configurationService.getConfiguration<IFilesConfiguration>();
this._onReadyPromise = this._extensionService.onReady().then(() => {
this.onConfigurationChange(configuration);
this.updateMime();
return true;
});
}
@@ -143,7 +145,8 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
return this._onReadyPromise;
}
private onConfigurationChange(configuration: IFilesConfiguration): void {
private updateMime(): void {
const configuration = this._configurationService.getConfiguration<IFilesConfiguration>();
// Clear user configured mime associations
mime.clearTextMimes(true /* user configured */);