Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion internal/fourslash/_scripts/failingTests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ TestDoubleUnderscoreCompletions
TestEditJsdocType
TestExportDefaultClass
TestExportDefaultFunction
TestExportEqualNamespaceClassESModuleInterop
TestFindAllReferencesDynamicImport1
TestFindAllReferencesTripleSlash
TestFindAllReferencesUmdModuleAsGlobalConst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

func TestExportEqualNamespaceClassESModuleInterop(t *testing.T) {
t.Parallel()
t.Skip()

defer testutil.RecoverAndFail(t, "Panic on fourslash test")
const content = `// @esModuleInterop: true
// @moduleResolution: node
Expand Down
7 changes: 4 additions & 3 deletions internal/ls/autoimports.go
Original file line number Diff line number Diff line change
Expand Up @@ -859,13 +859,14 @@ func tryUseExistingNamespaceImport(existingImports []*FixAddToExistingImportInfo
declaration := existingImport.declaration
switch declaration.Kind {
case ast.KindVariableDeclaration, ast.KindImportEqualsDeclaration:
if declaration.Kind == ast.KindVariableDeclaration && declaration.Name().Kind != ast.KindIdentifier {
name := declaration.Name()
if declaration.Kind == ast.KindVariableDeclaration && (name == nil || name.Kind != ast.KindIdentifier) {
continue
}
namespacePrefix = declaration.Name().Text()
namespacePrefix = name.Text()
case ast.KindJSDocImportTag, ast.KindImportDeclaration:
importClause := ast.GetImportClauseOfDeclaration(declaration)
if importClause == nil || importClause.NamedBindings.Kind != ast.KindNamespaceImport {
if importClause == nil || importClause.NamedBindings == nil || importClause.NamedBindings.Kind != ast.KindNamespaceImport {
continue
}
namespacePrefix = importClause.NamedBindings.Name().Text()
Expand Down
Loading