Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove autoClosingPairs, surroundingPair in favour of deprecated api and language config file, fixes #8737

Browse Source
This commit is contained in:
Johannes Rieken
2016-07-06 15:15:08 +02:00
parent fa7ce995f4
commit 7cb8e4514e
7 changed files with 66 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -837,12 +837,6 @@ export class ExtHostLanguageFeatures {
this._documents.setWordDefinitionFor(languageId, null);
}
// backward compatibility, migrate deprecated setting
if (configuration.__characterPairSupport && !configuration.autoClosingPairs) {
configuration.autoClosingPairs = configuration.__characterPairSupport.autoClosingPairs;
delete configuration.__characterPairSupport;
}
const handle = this._nextHandle();
this._proxy.$setLanguageConfiguration(handle, languageId, configuration);
return this._createDisposable(handle);

9
src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
View File

@@ -16,7 +16,7 @@ import {CancellationToken} from 'vs/base/common/cancellation';
import {Position as EditorPosition} from 'vs/editor/common/core/position';
import {Range as EditorRange} from 'vs/editor/common/core/range';
import {ExtHostContext, ExtHostLanguageFeaturesShape} from './extHostProtocol';
import {LanguageConfigurationRegistry} from 'vs/editor/common/modes/languageConfigurationRegistry';
import {LanguageConfigurationRegistry, LanguageConfiguration} from 'vs/editor/common/modes/languageConfigurationRegistry';
export class MainThreadLanguageFeatures {
@@ -203,7 +203,12 @@ export class MainThreadLanguageFeatures {
// --- configuration
$setLanguageConfiguration(handle: number, languageId:string, configuration: vscode.LanguageConfiguration): TPromise<any> {
$setLanguageConfiguration(handle: number, languageId: string, configuration: vscode.LanguageConfiguration): TPromise<any> {
if (configuration.__characterPairSupport) {
(<LanguageConfiguration> configuration).autoClosingPairs = configuration.__characterPairSupport.autoClosingPairs;
}
this._registrations[handle] = LanguageConfigurationRegistry.register(languageId, configuration);
return undefined;
}