Skip to content

Add current directory, useCasesensitive file names to each baseline #53483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion src/testRunner/unittests/tsc/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,11 @@ export function verifyTsc({
texts.push(`Change:: ${incrementalScenario.caption}`);
texts.push(sys.baseLine().text);
});
return { file, text: texts.join("\r\n") };
return {
file,
text: `currentDirectory:: ${sys.getCurrentDirectory()} useCaseSensitiveFileNames: ${sys.useCaseSensitiveFileNames}\r\n` +
texts.join("\r\n"),
};
}
}));
if (edits?.length) {
Expand Down
1 change: 1 addition & 0 deletions src/testRunner/unittests/tscWatch/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export function createBaseline(system: TestServerHost, modifySystem?: (sys: Test
modifySystem?.(initialSys, originalRead);
const sys = changeToHostTrackingWrittenFiles(initialSys);
const baseline: string[] = [];
baseline.push(`currentDirectory:: ${sys.getCurrentDirectory()} useCaseSensitiveFileNames: ${sys.useCaseSensitiveFileNames}`);
baseline.push("Input::");
sys.diff(baseline);
const { cb, getPrograms } = commandLineCallbacks(sys);
Expand Down
9 changes: 5 additions & 4 deletions src/testRunner/unittests/tsserver/compileOnSave.ts
Original file line number Diff line number Diff line change
Expand Up @@ -734,20 +734,21 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => {

describe("unittests:: tsserver:: compileOnSave:: EmitFile test", () => {
it("should respect line endings", () => {
const logger = test("\n");
const logger = createLoggerWithInMemoryLogs(/*host*/ undefined!); //special handling
test("\n", logger);
test("\r\n", logger);
baselineTsserverLogs("compileOnSave", "line endings", { logger });

function test(newLine: string, logger?: Logger) {
function test(newLine: string, logger: Logger) {
const lines = ["var x = 1;", "var y = 2;"];
const path = "/a/app";
const f = {
path: path + ts.Extension.Ts,
content: lines.join(newLine)
};
const host = createServerHost([f], { newLine });
if (logger) logger.host = host;
else logger = createLoggerWithInMemoryLogs(host);
logger.host = host;
logger.log(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames} newLine: ${host.newLine}`);
const session = createSession(host, { logger });
openFilesForSession([f], session);
session.executeCommandSeq<ts.server.protocol.CompileOnSaveEmitFileRequest>({
Expand Down
1 change: 1 addition & 0 deletions src/testRunner/unittests/tsserver/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ function sanitizeLog(s: string) {
export function createLoggerWithInMemoryLogs(host: TestServerHost): Logger {
const logger = createHasErrorMessageLogger();
const logs: string[] = [];
if (host) logs.push(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames}`);
return handleLoggerGroup({
...logger,
logs,
Expand Down
22 changes: 9 additions & 13 deletions src/testRunner/unittests/tsserver/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
createServerHost,
File,
libFile,
TestServerHost,
} from "../virtualFileSystemWithWatch";
import {
baselineTsserverLogs,
Expand Down Expand Up @@ -771,52 +772,47 @@ describe("unittests:: tsserver:: Projects", () => {
content: JSON.stringify({ compilerOptions: { allowJs: true } })
};

let host = createServerHost([file1, file2, config1, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") });
const logger = createLoggerWithInMemoryLogs(host);
const logger = createLoggerWithInMemoryLogs(/*host*/ undefined!); // Special

// Specify .html extension as mixed content in a configure host request
const extraFileExtensions = [{ extension: ".html", scriptKind: ts.ScriptKind.JS, isMixedContent: true }];
verfiy(config1);
verfiy(config1, createServerHost([file1, file2, config1, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") }));

// #2. Ensure no errors when allowJs is false
const config2 = {
path: "/a/b/tsconfig.json",
content: JSON.stringify({ compilerOptions: { allowJs: false } })
};

host = createServerHost([file1, file2, config2, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") });
verfiy(config2);
verfiy(config2, createServerHost([file1, file2, config2, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") }));

// #3. Ensure no errors when compiler options aren't specified
const config3 = {
path: "/a/b/tsconfig.json",
content: JSON.stringify({})
};

host = createServerHost([file1, file2, config3, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") });
verfiy(config3);
verfiy(config3, createServerHost([file1, file2, config3, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") }));

// #4. Ensure no errors when files are explicitly specified in tsconfig
const config4 = {
path: "/a/b/tsconfig.json",
content: JSON.stringify({ compilerOptions: { allowJs: true }, files: [file1.path, file2.path] })
};

host = createServerHost([file1, file2, config4, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") });
verfiy(config4);
verfiy(config4, createServerHost([file1, file2, config4, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") }));

// #4. Ensure no errors when files are explicitly excluded in tsconfig
const config5 = {
path: "/a/b/tsconfig.json",
content: JSON.stringify({ compilerOptions: { allowJs: true }, exclude: [file2.path] })
};

host = createServerHost([file1, file2, config5, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") });
const session = verfiy(config5);
const session = verfiy(config5, createServerHost([file1, file2, config5, libFile], { executingFilePath: ts.combinePaths(ts.getDirectoryPath(libFile.path), "tsc.js") }));
baselineTsserverLogs("projects", "no tsconfig script block diagnostic errors", session);

function verfiy(config: File) {
function verfiy(config: File, host: TestServerHost) {
logger.host = host;
logger.log(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames}`);
const session = createSession(host, { logger });
session.executeCommandSeq<ts.server.protocol.ConfigureRequest>({
command: ts.server.protocol.CommandTypes.Configure,
Expand Down
1 change: 1 addition & 0 deletions src/testRunner/unittests/tsserver/watchEnvironment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ it("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watching fil
);
logger.host = host;
logger.info(`For files of style ${path}`);
logger.log(`currentDirectory:: ${host.getCurrentDirectory()} useCaseSensitiveFileNames: ${host.useCaseSensitiveFileNames}`);
const session = createSession(host, { logger });
openFilesForSession([file], session);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
currentDirectory:: / useCaseSensitiveFileNames: false
Input::
//// [/lib/lib.d.ts]
/// <reference no-default-lib="true"/>
Expand Down
Loading