maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use objects.equals for comparing configuration objects

Browse source
This commit is contained in:
Matt Bierner 2020-11-04 14:30:18 -08:00
parent 05fee0cf3d
commit ff7cc33236
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
extensions/typescript-language-features/src/utils/configuration.ts
View file

@ -7,7 +7,6 @@ import * as os from 'os';
import * as path from 'path';
import * as vscode from 'vscode';
import * as objects from '../utils/objects';
import * as arrays from './arrays';
export enum TsServerLogLevel {
Off,
@ -66,10 +65,7 @@ export class ImplicitProjectConfiguration {
}
public isEqualTo(other: ImplicitProjectConfiguration): boolean {
return this.checkJs === other.checkJs
&& this.experimentalDecorators === other.experimentalDecorators
&& this.strictNullChecks === other.strictNullChecks
&& this.strictFunctionTypes === other.strictFunctionTypes;
return objects.equals(this, other);
}
private static readCheckJs(configuration: vscode.WorkspaceConfiguration): boolean {
@ -129,20 +125,7 @@ export class TypeScriptServiceConfiguration {
}
public isEqualTo(other: TypeScriptServiceConfiguration): boolean {
return this.locale === other.locale
&& this.globalTsdk === other.globalTsdk
&& this.localTsdk === other.localTsdk
&& this.npmLocation === other.npmLocation
&& this.tsServerLogLevel === other.tsServerLogLevel
&& this.implictProjectConfiguration.isEqualTo(other.implictProjectConfiguration)
&& this.disableAutomaticTypeAcquisition === other.disableAutomaticTypeAcquisition
&& arrays.equals(this.tsServerPluginPaths, other.tsServerPluginPaths)
&& this.separateSyntaxServer === other.separateSyntaxServer
&& this.enableProjectDiagnostics === other.enableProjectDiagnostics
&& this.maxTsServerMemory === other.maxTsServerMemory
&& objects.equals(this.watchOptions, other.watchOptions)
&& this.enablePromptUseWorkspaceTsdk === other.enablePromptUseWorkspaceTsdk
&& this.includePackageJsonAutoImports === other.includePackageJsonAutoImports;
return objects.equals(this, other);
}
private static fixPathPrefixes(inspectValue: string): string {