Skip to content

Commit dc1a244

Browse files
sheetalkamatsheetalkamat
committed
Dont make sourceFiles sharing depend on moduleResolution options but only options that affect sourceFile
1 parent b74d5c3 commit dc1a244

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

‎src/compiler/commandLineParser.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
553553
node16: ModuleKind.Node16,
554554
nodenext: ModuleKind.NodeNext,
555555
})),
556+
affectsSourceFile: true,
556557
affectsModuleResolution: true,
557558
affectsEmit: true,
558559
affectsBuildInfo: true,
@@ -987,6 +988,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
987988
bundler: ModuleResolutionKind.Bundler,
988989
})),
989990
deprecatedKeys: new Set(["node"]),
991+
affectsSourceFile: true,
990992
affectsModuleResolution: true,
991993
paramType: Diagnostics.STRATEGY,
992994
category: Diagnostics.Modules,
@@ -1533,6 +1535,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
15331535
legacy: ModuleDetectionKind.Legacy,
15341536
force: ModuleDetectionKind.Force,
15351537
})),
1538+
affectsSourceFile: true,
15361539
affectsModuleResolution: true,
15371540
description: Diagnostics.Control_what_method_is_used_to_detect_module_format_JS_files,
15381541
category: Diagnostics.Language_and_Environment,
@@ -1564,7 +1567,7 @@ export const affectsDeclarationPathOptionDeclarations: readonly CommandLineOptio
15641567
export const moduleResolutionOptionDeclarations: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsModuleResolution);
15651568

15661569
/** @internal */
1567-
export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics);
1570+
export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsBindDiagnostics);
15681571

15691572
/** @internal */
15701573
export const optionsAffectingProgramStructure: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsProgramStructure);

‎tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan,-and-orphan-script-info-changes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Info seq [hh:mm:ss:mss] Open files:
6969
Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/index.ts ProjectRootPath: undefined
7070
Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json
7171
DocumentRegistry::
72-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
72+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
7373
/user/username/projects/myproject/index.ts: TS 1
7474
/user/username/projects/myproject/module1.d.ts: TS 1
7575
/a/lib/lib.d.ts: TS 1
@@ -88,7 +88,7 @@ Info seq [hh:mm:ss:mss] Files (2)
8888

8989
Info seq [hh:mm:ss:mss] -----------------------------------------------
9090
DocumentRegistry::
91-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
91+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
9292
/user/username/projects/myproject/index.ts: TS 1
9393
/a/lib/lib.d.ts: TS 1
9494
Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /user/username/projects/myproject/module1.d.ts 1:: WatchInfo: /user/username/projects/myproject/module1.d.ts 500 undefined WatchType: Closed Script info
@@ -111,7 +111,7 @@ Info seq [hh:mm:ss:mss] Files (3)
111111

112112
Info seq [hh:mm:ss:mss] -----------------------------------------------
113113
DocumentRegistry::
114-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
114+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
115115
/user/username/projects/myproject/index.ts: TS 1
116116
/a/lib/lib.d.ts: TS 1
117117
/user/username/projects/myproject/module1.d.ts: TS 1

‎tests/baselines/reference/tsserver/documentRegistry/Caches-the-source-file-if-script-info-is-orphan.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Info seq [hh:mm:ss:mss] Open files:
6969
Info seq [hh:mm:ss:mss] FileName: /user/username/projects/myproject/index.ts ProjectRootPath: undefined
7070
Info seq [hh:mm:ss:mss] Projects: /user/username/projects/myproject/tsconfig.json
7171
DocumentRegistry::
72-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
72+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
7373
/user/username/projects/myproject/index.ts: TS 1
7474
/user/username/projects/myproject/module1.d.ts: TS 1
7575
/a/lib/lib.d.ts: TS 1
@@ -88,7 +88,7 @@ Info seq [hh:mm:ss:mss] Files (2)
8888

8989
Info seq [hh:mm:ss:mss] -----------------------------------------------
9090
DocumentRegistry::
91-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
91+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
9292
/user/username/projects/myproject/index.ts: TS 1
9393
/a/lib/lib.d.ts: TS 1
9494
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
@@ -109,7 +109,7 @@ Info seq [hh:mm:ss:mss] Files (3)
109109

110110
Info seq [hh:mm:ss:mss] -----------------------------------------------
111111
DocumentRegistry::
112-
Key:: undefined|undefined|undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined|undefined
112+
Key:: undefined|undefined|undefined|false|undefined|undefined|undefined|undefined|undefined|undefined
113113
/user/username/projects/myproject/index.ts: TS 1
114114
/a/lib/lib.d.ts: TS 1
115115
/user/username/projects/myproject/module1.d.ts: TS 1

0 commit comments

Comments
 (0)