Use 'auto' for default TS preference values

This commit is contained in:
Matt Bierner
2018-05-03 14:05:34 -07:00
parent e032970c1b
commit c488e28c29
3 changed files with 29 additions and 5 deletions

View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { workspace as Workspace, FormattingOptions, TextDocument, CancellationToken, window, Disposable, workspace } from 'vscode';
import { workspace as Workspace, FormattingOptions, TextDocument, CancellationToken, window, Disposable, workspace, WorkspaceConfiguration } from 'vscode';
import * as Proto from '../protocol';
import { ITypeScriptServiceClient } from '../typescriptService';
@@ -156,12 +156,28 @@ export default class FileConfigurationManager {
document.uri);
return {
quotePreference: config.get<'single' | 'double' | undefined>('quoteStyle'),
importModuleSpecifierPreference: config.get<'relative' | 'non-relative' | undefined>('importModuleSpecifier')
quotePreference: getQuoteStylePreference(config),
importModuleSpecifierPreference: getImportModuleSpecifierPreference(config)
};
}
}
function getQuoteStylePreference(config: WorkspaceConfiguration) {
switch (config.get<string>('quoteStyle')) {
case 'single': return 'single';
case 'double': return 'double';
default: return undefined;
}
}
function getImportModuleSpecifierPreference(config: WorkspaceConfiguration) {
switch (config.get<string>('importModuleSpecifier')) {
case 'relative': return 'relative';
case 'non-relative': return 'non-relative';
default: return undefined;
}
}
function isTypeScriptDocument(document: TextDocument) {
return document.languageId === languageIds.typescript || document.languageId === languageIds.typescriptreact;
}