Skip to content

Take namespace into account for incremental cleanup #1164

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.

Sign up for GitHub

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
nojaf merged 3 commits into from
Dec 18, 2025
Merged

Take namespace into account for incremental cleanup #1164

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092e35e
Take namespace into account for incremental cleanup
nojaf Dec 18, 2025
0898a6b
Add changelog entry
nojaf Dec 18, 2025
750a28b
Log server version on initialize
nojaf Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions server/src/incrementalCompilation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,19 +295,21 @@ function triggerIncrementalCompilationOfFile(
INCREMENTAL_FILE_FOLDER_LOCATION,
) as NormalizedPath;

// projectRootPath is already NormalizedPath, appending a constant string still makes it a NormalizedPath
let originalTypeFileLocation = path.resolve(
const relSourcePath = path.relative(projectRootPath, filePath);
const relSourceDir = path.dirname(relSourcePath);
const typeExt = ext === ".res" ? ".cmt" : ".cmti";
const originalTypeFileName =
project.namespaceName != null
? `${moduleName}-${project.namespaceName}${typeExt}`
: `${moduleName}${typeExt}`;
// projectRootPath is already NormalizedPath, appending constant strings still yields a NormalizedPath
const originalTypeFileLocation = path.resolve(
projectRootPath,
c.compilerDirPartialPath,
path.relative(projectRootPath, filePath),
relSourceDir,
originalTypeFileName,
) as NormalizedPath;

const parsed = path.parse(originalTypeFileLocation);
parsed.ext = ext === ".res" ? ".cmt" : ".cmti";
parsed.base = "";
// As originalTypeFileLocation was a NormalizedPath, path.format ensures we can assume string is now NormalizedPath
originalTypeFileLocation = path.format(parsed) as NormalizedPath;

incrementalFileCacheEntry = {
file: {
originalTypeFileLocation,
Expand Down
Loading