Fix merge

dibarbet · web-flow · commit a2e1a7f11880 · 2023-10-02T12:08:21.000-07:00
diff --git a/src/shared/options.ts b/src/shared/options.ts
@@ -74,7 +74,6 @@ export interface LanguageServerOptions {
     readonly extensionsPaths: string[] | null;
     readonly preferCSharpExtension: boolean;
     readonly startTimeout: number;
-    readonly preferCSharpExtension: boolean;
     readonly crashDumpPath: string | undefined;
 }
 
@@ -387,9 +386,6 @@ class LanguageServerOptionsImpl implements LanguageServerOptions {
     public get startTimeout() {
         return readOption<number>('dotnet.server.startTimeout', 30000);
     }
-    public get preferCSharpExtension() {
-        return readOption<boolean>('dotnet.preferCSharpExtension', false);
-    }
     public get crashDumpPath() {
         return readOption<string | undefined>('dotnet.server.crashDumpPath', undefined);
     }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ export interface LanguageServerOptions {`
`74`	`74`	`readonly extensionsPaths: string[] \| null;`
`75`	`75`	`readonly preferCSharpExtension: boolean;`
`76`	`76`	`readonly startTimeout: number;`
`77`		`- readonly preferCSharpExtension: boolean;`
`78`	`77`	`readonly crashDumpPath: string \| undefined;`
`79`	`78`	`}`
`80`	`79`
`@@ -387,9 +386,6 @@ class LanguageServerOptionsImpl implements LanguageServerOptions {`
`387`	`386`	`public get startTimeout() {`
`388`	`387`	`return readOption<number>('dotnet.server.startTimeout', 30000);`
`389`	`388`	`}`
`390`		`- public get preferCSharpExtension() {`
`391`		`- return readOption<boolean>('dotnet.preferCSharpExtension', false);`
`392`		`- }`
`393`	`389`	`public get crashDumpPath() {`
`394`	`390`	`return readOption<string \| undefined>('dotnet.server.crashDumpPath', undefined);`
`395`	`391`	`}`