diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt index 54854f47e3..d20990edbd 100644 --- a/internal/fourslash/_scripts/failingTests.txt +++ b/internal/fourslash/_scripts/failingTests.txt @@ -167,7 +167,6 @@ TestDoubleUnderscoreCompletions TestEditJsdocType TestExportDefaultClass TestExportDefaultFunction -TestExportEqualNamespaceClassESModuleInterop TestFindAllReferencesDynamicImport1 TestFindAllReferencesTripleSlash TestFindAllReferencesUmdModuleAsGlobalConst diff --git a/internal/fourslash/tests/gen/exportEqualNamespaceClassESModuleInterop_test.go b/internal/fourslash/tests/gen/exportEqualNamespaceClassESModuleInterop_test.go index 1c3669c741..32f1db0ff0 100644 --- a/internal/fourslash/tests/gen/exportEqualNamespaceClassESModuleInterop_test.go +++ b/internal/fourslash/tests/gen/exportEqualNamespaceClassESModuleInterop_test.go @@ -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 diff --git a/internal/ls/autoimports.go b/internal/ls/autoimports.go index 49128a1895..3b38e0d637 100644 --- a/internal/ls/autoimports.go +++ b/internal/ls/autoimports.go @@ -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()