microsoft
diff --git a/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/compiler/commandLineParser.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/compiler/tsbuildPublic.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/compiler/tsbuildPublic.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/compiler/types.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/compiler/types.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/compiler/watchPublic.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/compiler/watchPublic.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/harness/client.ts
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion b/‎src/harness/client.ts
Copy file name to clipboard
+12-1Lines changed: 12 additions & 1 deletion
diff --git a/‎src/harness/fourslashImpl.ts
Copy file name to clipboard
+25-28Lines changed: 25 additions & 28 deletions b/‎src/harness/fourslashImpl.ts
Copy file name to clipboard
+25-28Lines changed: 25 additions & 28 deletions
diff --git a/‎src/harness/fourslashInterfaceImpl.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/harness/fourslashInterfaceImpl.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/harness/harnessLanguageService.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/harness/harnessLanguageService.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
@@ -2361,7 +2361,7 @@ namespace ts {
             }
 
             const result = matchFileNames(filesSpecs, includeSpecs, excludeSpecs, configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath, options, host, errors, extraFileExtensions, sourceFile);
-            if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles(raw), resolutionStack)) {
+            if (shouldReportNoInputFiles(result, canJsonReportNoInputFiles(raw), resolutionStack)) {
                 errors.push(getErrorForNoInputFiles(result.spec, configFileName));
             }
 
@@ -2413,7 +2413,7 @@ namespace ts {
     }
 
     /*@internal*/
-    export function canJsonReportNoInutFiles(raw: any) {
+    export function canJsonReportNoInputFiles(raw: any) {
         return !hasProperty(raw, "files") && !hasProperty(raw, "references");
     }
 
 
@@ -1187,7 +1187,7 @@ namespace ts {
             else if (reloadLevel === ConfigFileProgramReloadLevel.Partial) {
                 // Update file names
                 const result = getFileNamesFromConfigSpecs(config.configFileSpecs!, getDirectoryPath(project), config.options, state.parseConfigFileHost);
-                updateErrorForNoInputFiles(result, project, config.configFileSpecs!, config.errors, canJsonReportNoInutFiles(config.raw));
+                updateErrorForNoInputFiles(result, project, config.configFileSpecs!, config.errors, canJsonReportNoInputFiles(config.raw));
                 config.fileNames = result.fileNames;
                 watchInputFiles(state, project, projectPath, config);
             }
@@ -1371,7 +1371,7 @@ namespace ts {
         }
 
         // Container if no files are specified in the project
-        if (!project.fileNames.length && !canJsonReportNoInutFiles(project.raw)) {
+        if (!project.fileNames.length && !canJsonReportNoInputFiles(project.raw)) {
             return {
                 type: UpToDateStatusType.ContainerOnly
             };
 
@@ -8024,6 +8024,7 @@ namespace ts {
         readonly importModuleSpecifierEnding?: "auto" | "minimal" | "index" | "js";
         readonly allowTextChangesInNewFiles?: boolean;
         readonly providePrefixAndSuffixTextForRename?: boolean;
+        readonly includePackageJsonAutoImports?: "exclude-dev" | "all" | "none";
         readonly provideRefactorNotApplicableReason?: boolean;
     }
 
 
@@ -671,7 +671,7 @@ namespace ts {
             configFileSpecs = configFileParseResult.configFileSpecs!; // TODO: GH#18217
             projectReferences = configFileParseResult.projectReferences;
             configFileParsingDiagnostics = getConfigFileParsingDiagnostics(configFileParseResult).slice();
-            canConfigFileJsonReportNoInputFiles = canJsonReportNoInutFiles(configFileParseResult.raw);
+            canConfigFileJsonReportNoInputFiles = canJsonReportNoInputFiles(configFileParseResult.raw);
             hasChangedConfigFileParsingErrors = true;
         }
 
 
@@ -131,6 +131,13 @@ namespace ts.server {
             this.processResponse(request, /*expectEmptyBody*/ true);
         }
 
+        /*@internal*/
+        setFormattingOptions(formatOptions: FormatCodeSettings) {
+            const args: protocol.ConfigureRequestArguments = { formatOptions };
+            const request = this.processRequest(CommandNames.Configure, args);
+            this.processResponse(request, /*expectEmptyBody*/ true);
+        }
+
         openFile(file: string, fileContent?: string, scriptKindName?: "TS" | "JS" | "TSX" | "JSX"): void {
             const args: protocol.OpenRequestArgs = { file, fileContent, scriptKindName };
             this.processRequest(CommandNames.Open, args);
@@ -791,7 +798,11 @@ namespace ts.server {
         }
 
         getProgram(): Program {
-            throw new Error("SourceFile objects are not serializable through the server protocol.");
+            throw new Error("Program objects are not serializable through the server protocol.");
+        }
+
+        getAutoImportProvider(): Program | undefined {
+            throw new Error("Program objects are not serializable through the server protocol.");
         }
 
         getNonBoundSourceFile(_fileName: string): SourceFile {
 
@@ -871,53 +871,47 @@ namespace FourSlash {
         }
 
         private verifyCompletionEntry(actual: ts.CompletionEntry, expected: FourSlashInterface.ExpectedCompletionEntry) {
-            const { insertText, replacementSpan, hasAction, isRecommended, isFromUncheckedFile, kind, kindModifiers, text, documentation, tags, source, sourceDisplay, sortText } = typeof expected === "string"
-                ? { insertText: undefined, replacementSpan: undefined, hasAction: undefined, isRecommended: undefined, isFromUncheckedFile: undefined, kind: undefined, kindModifiers: undefined, text: undefined, documentation: undefined, tags: undefined, source: undefined, sourceDisplay: undefined, sortText: undefined }
-                : expected;
+            expected = typeof expected === "string" ? { name: expected } : expected;
 
-            if (actual.insertText !== insertText) {
-                this.raiseError(`Expected completion insert text to be ${insertText}, got ${actual.insertText}`);
+            if (actual.insertText !== expected.insertText) {
+                this.raiseError(`Expected completion insert text to be ${expected.insertText}, got ${actual.insertText}`);
             }
-            const convertedReplacementSpan = replacementSpan && ts.createTextSpanFromRange(replacementSpan);
+            const convertedReplacementSpan = expected.replacementSpan && ts.createTextSpanFromRange(expected.replacementSpan);
             try {
                 assert.deepEqual(actual.replacementSpan, convertedReplacementSpan);
             }
             catch {
                 this.raiseError(`Expected completion replacementSpan to be ${stringify(convertedReplacementSpan)}, got ${stringify(actual.replacementSpan)}`);
             }
 
-            if (kind !== undefined || kindModifiers !== undefined) {
-                if (actual.kind !== kind) {
-                    this.raiseError(`Unexpected kind for ${actual.name}: Expected '${kind}', actual '${actual.kind}'`);
-                }
-                if (actual.kindModifiers !== (kindModifiers || "")) {
-                    this.raiseError(`Bad kindModifiers for ${actual.name}: Expected ${kindModifiers || ""}, actual ${actual.kindModifiers}`);
-                }
+            if (expected.kind !== undefined || expected.kindModifiers !== undefined) {
+                assert.equal(actual.kind, expected.kind, `Expected 'kind' for ${actual.name} to match`);
+                assert.equal(actual.kindModifiers, expected.kindModifiers || "", `Expected 'kindModifiers' for ${actual.name} to match`);
             }
-
-            if (isFromUncheckedFile !== undefined) {
-                if (actual.isFromUncheckedFile !== isFromUncheckedFile) {
-                    this.raiseError(`Expected 'isFromUncheckedFile' value '${actual.isFromUncheckedFile}' to equal '${isFromUncheckedFile}'`);
-                }
+            if (expected.isFromUncheckedFile !== undefined) {
+                assert.equal<boolean | undefined>(actual.isFromUncheckedFile, expected.isFromUncheckedFile, "Expected 'isFromUncheckedFile' properties to match");
+            }
+            if (expected.isPackageJsonImport !== undefined) {
+                assert.equal<boolean | undefined>(actual.isPackageJsonImport, expected.isPackageJsonImport, "Expected 'isPackageJsonImport' properties to match");
             }
 
-            assert.equal(actual.hasAction, hasAction, `Expected 'hasAction' properties to match`);
-            assert.equal(actual.isRecommended, isRecommended, `Expected 'isRecommended' properties to match'`);
-            assert.equal(actual.source, source, `Expected 'source' values to match`);
-            assert.equal(actual.sortText, sortText || ts.Completions.SortText.LocationPriority, this.messageAtLastKnownMarker(`Actual entry: ${JSON.stringify(actual)}`));
+            assert.equal(actual.hasAction, expected.hasAction, `Expected 'hasAction' properties to match`);
+            assert.equal(actual.isRecommended, expected.isRecommended, `Expected 'isRecommended' properties to match'`);
+            assert.equal(actual.source, expected.source, `Expected 'source' values to match`);
+            assert.equal(actual.sortText, expected.sortText || ts.Completions.SortText.LocationPriority, this.messageAtLastKnownMarker(`Actual entry: ${JSON.stringify(actual)}`));
 
-            if (text !== undefined) {
+            if (expected.text !== undefined) {
                 const actualDetails = this.getCompletionEntryDetails(actual.name, actual.source)!;
-                assert.equal(ts.displayPartsToString(actualDetails.displayParts), text, "Expected 'text' property to match 'displayParts' string");
-                assert.equal(ts.displayPartsToString(actualDetails.documentation), documentation || "", "Expected 'documentation' property to match 'documentation' display parts string");
+                assert.equal(ts.displayPartsToString(actualDetails.displayParts), expected.text, "Expected 'text' property to match 'displayParts' string");
+                assert.equal(ts.displayPartsToString(actualDetails.documentation), expected.documentation || "", "Expected 'documentation' property to match 'documentation' display parts string");
                 // TODO: GH#23587
                 // assert.equal(actualDetails.kind, actual.kind);
                 assert.equal(actualDetails.kindModifiers, actual.kindModifiers, "Expected 'kindModifiers' properties to match");
-                assert.equal(actualDetails.source && ts.displayPartsToString(actualDetails.source), sourceDisplay, "Expected 'sourceDisplay' property to match 'source' display parts string");
-                assert.deepEqual(actualDetails.tags, tags);
+                assert.equal(actualDetails.source && ts.displayPartsToString(actualDetails.source), expected.sourceDisplay, "Expected 'sourceDisplay' property to match 'source' display parts string");
+                assert.deepEqual(actualDetails.tags, expected.tags);
             }
             else {
-                assert(documentation === undefined && tags === undefined && sourceDisplay === undefined, "If specifying completion details, should specify 'text'");
+                assert(expected.documentation === undefined && expected.tags === undefined && expected.sourceDisplay === undefined, "If specifying completion details, should specify 'text'");
             }
         }
 
@@ -2122,6 +2116,9 @@ namespace FourSlash {
         public setFormatOptions(formatCodeOptions: ts.FormatCodeOptions | ts.FormatCodeSettings): ts.FormatCodeSettings {
             const oldFormatCodeOptions = this.formatCodeSettings;
             this.formatCodeSettings = ts.toEditorSettings(formatCodeOptions);
+            if (this.testType === FourSlashTestType.Server) {
+                (this.languageService as ts.server.SessionClient).setFormattingOptions(this.formatCodeSettings);
+            }
             return oldFormatCodeOptions;
         }
 
 
@@ -731,7 +731,7 @@ namespace FourSlashInterface {
         }
 
         public setOption(name: keyof ts.FormatCodeSettings, value: number | string | boolean): void {
-            this.state.formatCodeSettings = { ...this.state.formatCodeSettings, [name]: value };
+            this.state.setFormatOptions({ ...this.state.formatCodeSettings, [name]: value });
         }
     }
 
@@ -1495,6 +1495,7 @@ namespace FourSlashInterface {
         readonly isRecommended?: boolean; // If not specified, will assert that this is false.
         readonly isFromUncheckedFile?: boolean; // If not specified, won't assert about this
         readonly kind?: string; // If not specified, won't assert about this
+        readonly isPackageJsonImport?: boolean; // If not specified, won't assert about this
         readonly kindModifiers?: string; // Must be paired with 'kind'
         readonly text?: string;
         readonly documentation?: string;
 
@@ -588,6 +588,9 @@ namespace Harness.LanguageService {
         getProgram(): ts.Program {
             throw new Error("Program can not be marshaled across the shim layer.");
         }
+        getAutoImportProvider(): ts.Program | undefined {
+            throw new Error("Program can not be marshaled across the shim layer.");
+        }
         getNonBoundSourceFile(): ts.SourceFile {
             throw new Error("SourceFile can not be marshaled across the shim layer.");
         }
Original file line number	Diff line number	Diff line change
`@@ -2361,7 +2361,7 @@ namespace ts {`
`2361`	`2361`	`}`
`2362`	`2362`
`2363`	`2363`	`const result = matchFileNames(filesSpecs, includeSpecs, excludeSpecs, configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath, options, host, errors, extraFileExtensions, sourceFile);`
`2364`		`- if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles(raw), resolutionStack)) {`
	`2364`	`+ if (shouldReportNoInputFiles(result, canJsonReportNoInputFiles(raw), resolutionStack)) {`
`2365`	`2365`	`errors.push(getErrorForNoInputFiles(result.spec, configFileName));`
`2366`	`2366`	`}`
`2367`	`2367`
`@@ -2413,7 +2413,7 @@ namespace ts {`
`2413`	`2413`	`}`
`2414`	`2414`
`2415`	`2415`	`/@internal/`
`2416`		`- export function canJsonReportNoInutFiles(raw: any) {`
	`2416`	`+ export function canJsonReportNoInputFiles(raw: any) {`
`2417`	`2417`	`return !hasProperty(raw, "files") && !hasProperty(raw, "references");`
`2418`	`2418`	`}`
`2419`	`2419`
Original file line number	Diff line number	Diff line change
`@@ -8024,6 +8024,7 @@ namespace ts {`
`8024`	`8024`	`readonly importModuleSpecifierEnding?: "auto" \| "minimal" \| "index" \| "js";`
`8025`	`8025`	`readonly allowTextChangesInNewFiles?: boolean;`
`8026`	`8026`	`readonly providePrefixAndSuffixTextForRename?: boolean;`
	`8027`	`+ readonly includePackageJsonAutoImports?: "exclude-dev" \| "all" \| "none";`
`8027`	`8028`	`readonly provideRefactorNotApplicableReason?: boolean;`
`8028`	`8029`	`}`
`8029`	`8030`
Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,7 @@ namespace ts {`
`671`	`671`	`configFileSpecs = configFileParseResult.configFileSpecs!; // TODO: GH#18217`
`672`	`672`	`projectReferences = configFileParseResult.projectReferences;`
`673`	`673`	`configFileParsingDiagnostics = getConfigFileParsingDiagnostics(configFileParseResult).slice();`
`674`		`- canConfigFileJsonReportNoInputFiles = canJsonReportNoInutFiles(configFileParseResult.raw);`
	`674`	`+ canConfigFileJsonReportNoInputFiles = canJsonReportNoInputFiles(configFileParseResult.raw);`
`675`	`675`	`hasChangedConfigFileParsingErrors = true;`
`676`	`676`	`}`
`677`	`677`
Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ namespace FourSlashInterface {`
`731`	`731`	`}`
`732`	`732`
`733`	`733`	`public setOption(name: keyof ts.FormatCodeSettings, value: number \| string \| boolean): void {`
`734`		`- this.state.formatCodeSettings = { ...this.state.formatCodeSettings, [name]: value };`
	`734`	`+ this.state.setFormatOptions({ ...this.state.formatCodeSettings, [name]: value });`
`735`	`735`	`}`
`736`	`736`	`}`
`737`	`737`
`@@ -1495,6 +1495,7 @@ namespace FourSlashInterface {`
`1495`	`1495`	`readonly isRecommended?: boolean; // If not specified, will assert that this is false.`
`1496`	`1496`	`readonly isFromUncheckedFile?: boolean; // If not specified, won't assert about this`
`1497`	`1497`	`readonly kind?: string; // If not specified, won't assert about this`
	`1498`	`+ readonly isPackageJsonImport?: boolean; // If not specified, won't assert about this`
`1498`	`1499`	`readonly kindModifiers?: string; // Must be paired with 'kind'`
`1499`	`1500`	`readonly text?: string;`
`1500`	`1501`	`readonly documentation?: string;`
Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,9 @@ namespace Harness.LanguageService {`
`588`	`588`	`getProgram(): ts.Program {`
`589`	`589`	`throw new Error("Program can not be marshaled across the shim layer.");`
`590`	`590`	`}`
	`591`	`+ getAutoImportProvider(): ts.Program \| undefined {`
	`592`	`+ throw new Error("Program can not be marshaled across the shim layer.");`
	`593`	`+ }`
`591`	`594`	`getNonBoundSourceFile(): ts.SourceFile {`
`592`	`595`	`throw new Error("SourceFile can not be marshaled across the shim layer.");`
`593`	`596`	`}`