Skip to content

Commit 2d083f7

Browse files
sheetalkamatsheetalkamat
committed
Use compilation options to get extensions to remove to get module name
1 parent f7b7204 commit 2d083f7

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎src/compiler/binder.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ namespace ts {
7777
IsContainerWithLocals = IsContainer | HasLocals
7878
}
7979

80-
export function bindSourceFile(file: SourceFile) {
80+
export function bindSourceFile(file: SourceFile, compilerOptions: CompilerOptions) {
8181
let start = new Date().getTime();
82-
bindSourceFileWorker(file);
82+
bindSourceFileWorker(file, compilerOptions);
8383
bindTime += new Date().getTime() - start;
8484
}
8585

86-
function bindSourceFileWorker(file: SourceFile) {
86+
function bindSourceFileWorker(file: SourceFile, compilerOptions: CompilerOptions) {
8787
let parent: Node;
8888
let container: Node;
8989
let blockScopeContainer: Node;
@@ -941,7 +941,7 @@ namespace ts {
941941
function bindSourceFileIfExternalModule() {
942942
setExportContextFlag(file);
943943
if (isExternalModule(file)) {
944-
bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName)}"`);
944+
bindAnonymousDeclaration(file, SymbolFlags.ValueModule, `"${removeFileExtension(file.fileName, getSupportedExtensions(compilerOptions))}"`);
945945
}
946946
}
947947

‎src/compiler/checker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14833,7 +14833,7 @@ namespace ts {
1483314833
function initializeTypeChecker() {
1483414834
// Bind all source files and propagate errors
1483514835
forEach(host.getSourceFiles(), file => {
14836-
bindSourceFile(file);
14836+
bindSourceFile(file, compilerOptions);
1483714837
});
1483814838

1483914839
// Initialize global symbol table

‎src/services/navigationBar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/* @internal */
44
namespace ts.NavigationBar {
5-
export function getNavigationBarItems(sourceFile: SourceFile): ts.NavigationBarItem[] {
5+
export function getNavigationBarItems(sourceFile: SourceFile, compilerOptions: CompilerOptions): ts.NavigationBarItem[] {
66
// If the source file has any child items, then it included in the tree
77
// and takes lexical ownership of all other top-level items.
88
let hasGlobalNode = false;
@@ -442,7 +442,7 @@ namespace ts.NavigationBar {
442442

443443
hasGlobalNode = true;
444444
let rootName = isExternalModule(node)
445-
? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName)))) + "\""
445+
? "\"" + escapeString(getBaseFileName(removeFileExtension(normalizePath(node.fileName), getSupportedExtensions(compilerOptions)))) + "\""
446446
: "<global>"
447447

448448
return getNavigationBarItem(rootName,

‎src/services/services.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6263,7 +6263,7 @@ namespace ts {
62636263
function getNavigationBarItems(fileName: string): NavigationBarItem[] {
62646264
let sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
62656265

6266-
return NavigationBar.getNavigationBarItems(sourceFile);
6266+
return NavigationBar.getNavigationBarItems(sourceFile, host.getCompilationSettings());
62676267
}
62686268

62696269
function getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[] {

0 commit comments

Comments
 (0)