Module specifier completions (microsoft#2587)

Author: gabritto

internal/astnav/tokens.go

@@ -433,6 +433,9 @@ func FindPrecedingTokenEx(sourceFile *ast.SourceFile, position int, startNode *a
 }
 
 func isValidPrecedingNode(node *ast.Node, sourceFile *ast.SourceFile) bool {
+	if node.Kind == ast.KindEndOfFile {
+		return len(node.JSDoc(sourceFile)) > 0
+	}
 	start := GetStartOfNode(node, sourceFile, false /*includeJSDoc*/)
 	width := node.End() - start
 	return !(ast.IsWhitespaceOnlyJsxText(node) || width == 0)

internal/fourslash/_scripts/failingTests.txt

@@ -63,7 +63,6 @@ TestCompletionForComputedStringProperties
 TestCompletionForMetaProperty
 TestCompletionForObjectProperty
 TestCompletionForStringLiteral
-TestCompletionForStringLiteral_details
 TestCompletionForStringLiteral_quotePreference
 TestCompletionForStringLiteral_quotePreference1
 TestCompletionForStringLiteral_quotePreference2
@@ -74,34 +73,8 @@ TestCompletionForStringLiteral_quotePreference6
 TestCompletionForStringLiteral_quotePreference7
 TestCompletionForStringLiteral_quotePreference8
 TestCompletionForStringLiteral4
-TestCompletionForStringLiteralExport
-TestCompletionForStringLiteralImport1
-TestCompletionForStringLiteralImport2
-TestCompletionForStringLiteralNonrelativeImport12
-TestCompletionForStringLiteralNonrelativeImport14
-TestCompletionForStringLiteralNonrelativeImport16
-TestCompletionForStringLiteralNonrelativeImport17
-TestCompletionForStringLiteralNonrelativeImport18
-TestCompletionForStringLiteralNonrelativeImport2
-TestCompletionForStringLiteralNonrelativeImport3
-TestCompletionForStringLiteralNonrelativeImport4
-TestCompletionForStringLiteralNonrelativeImport8
-TestCompletionForStringLiteralNonrelativeImport9
-TestCompletionForStringLiteralNonrelativeImportTypings1
-TestCompletionForStringLiteralNonrelativeImportTypings2
-TestCompletionForStringLiteralNonrelativeImportTypings3
-TestCompletionForStringLiteralRelativeImport4
-TestCompletionForStringLiteralRelativeImport6
-TestCompletionForStringLiteralRelativeImportAllowJSTrue
-TestCompletionForStringLiteralWithDynamicImport
 TestCompletionImportMeta
 TestCompletionImportMetaWithGlobalDeclaration
-TestCompletionImportModuleSpecifierEndingDts
-TestCompletionImportModuleSpecifierEndingJs
-TestCompletionImportModuleSpecifierEndingJsx
-TestCompletionImportModuleSpecifierEndingTs
-TestCompletionImportModuleSpecifierEndingTsxPreserve
-TestCompletionImportModuleSpecifierEndingTsxReact
 TestCompletionImportModuleSpecifierEndingUnsupportedExtension
 TestCompletionInChecks1
 TestCompletionInFunctionLikeBody_includesPrimitiveTypes
@@ -113,8 +86,6 @@ TestCompletionListFunctionExpression
 TestCompletionListInArrowFunctionInUnclosedCallSite01
 TestCompletionListInClassExpressionWithTypeParameter
 TestCompletionListInClassStaticBlocks
-TestCompletionListInImportClause05
-TestCompletionListInImportClause06
 TestCompletionListInNamedClassExpression
 TestCompletionListInNamedClassExpressionWithShadowing
 TestCompletionListInNamedFunctionExpression
@@ -186,10 +157,6 @@ TestCompletionsImport_windowsPathsProjectRelative
 TestCompletionsImportOrExportSpecifier
 TestCompletionsInExport
 TestCompletionsInExport_moduleBlock
-TestCompletionsInRequire
-TestCompletionsJSDocImportTagAttributesEmptyModuleSpecifier1
-TestCompletionsJSDocImportTagAttributesErrorModuleSpecifier1
-TestCompletionsJSDocImportTagEmptyModuleSpecifier1
 TestCompletionsJSDocNoCrash1
 TestCompletionsJsdocTypeTagCast
 TestCompletionsJsxAttributeInitializer2
@@ -209,13 +176,6 @@ TestCompletionsOverridingMethod4
 TestCompletionsOverridingMethod9
 TestCompletionsOverridingMethodCrash1
 TestCompletionsOverridingProperties1
-TestCompletionsPaths_importType
-TestCompletionsPaths_kinds
-TestCompletionsPaths_pathMapping
-TestCompletionsPaths_pathMapping_nonTrailingWildcard1
-TestCompletionsPaths_pathMapping_parentDirectory
-TestCompletionsPathsJsonModule
-TestCompletionsPathsRelativeJsonModule
 TestCompletionsRecommended_namespace
 TestCompletionsRecommended_union
 TestCompletionsRedeclareModuleAsGlobal
@@ -347,24 +307,6 @@ TestGetJavaScriptQuickInfo8
 TestGetJavaScriptSyntacticDiagnostics24
 TestGetOccurrencesIfElseBroken
 TestHoverOverComment
-TestImportCompletions_importsMap1
-TestImportCompletions_importsMap2
-TestImportCompletions_importsMap3
-TestImportCompletions_importsMap4
-TestImportCompletions_importsMap5
-TestImportCompletionsPackageJsonExportsSpecifierEndsInTs
-TestImportCompletionsPackageJsonExportsTrailingSlash1
-TestImportCompletionsPackageJsonImports_ts
-TestImportCompletionsPackageJsonImportsConditions1
-TestImportCompletionsPackageJsonImportsLength1
-TestImportCompletionsPackageJsonImportsLength2
-TestImportCompletionsPackageJsonImportsPattern
-TestImportCompletionsPackageJsonImportsPattern_capsInPath1
-TestImportCompletionsPackageJsonImportsPattern_capsInPath2
-TestImportCompletionsPackageJsonImportsPattern_js_ts
-TestImportCompletionsPackageJsonImportsPattern_ts
-TestImportCompletionsPackageJsonImportsPattern_ts_ts
-TestImportCompletionsPackageJsonImportsPattern2
 TestImportFixesGlobalTypingsCache
 TestImportMetaCompletionDetails
 TestImportNameCodeFix_avoidRelativeNodeModules
@@ -478,62 +420,13 @@ TestMultilineCommentBeforeOpenBrace
 TestMultiModuleFundule
 TestNgProxy1
 TestNgProxy4
-TestNodeModulesImportCompletions1
 TestNoQuickInfoForLabel
 TestNoQuickInfoInWhitespace
 TestNumericPropertyNames
 TestOptionalPropertyFormatting
 TestOverloadQuickInfo
 TestParameterWithDestructuring
 TestParameterWithNestedDestructuring
-TestPathCompletionsAllowModuleAugmentationExtensions
-TestPathCompletionsAllowTsExtensions
-TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition
-TestPathCompletionsPackageJsonExportsCustomConditions
-TestPathCompletionsPackageJsonExportsWildcard1
-TestPathCompletionsPackageJsonExportsWildcard10
-TestPathCompletionsPackageJsonExportsWildcard11
-TestPathCompletionsPackageJsonExportsWildcard12
-TestPathCompletionsPackageJsonExportsWildcard2
-TestPathCompletionsPackageJsonExportsWildcard3
-TestPathCompletionsPackageJsonExportsWildcard4
-TestPathCompletionsPackageJsonExportsWildcard5
-TestPathCompletionsPackageJsonExportsWildcard6
-TestPathCompletionsPackageJsonExportsWildcard7
-TestPathCompletionsPackageJsonExportsWildcard8
-TestPathCompletionsPackageJsonExportsWildcard9
-TestPathCompletionsPackageJsonImportsBundlerNoNodeCondition
-TestPathCompletionsPackageJsonImportsCustomConditions
-TestPathCompletionsPackageJsonImportsIgnoreMatchingNodeModule2
-TestPathCompletionsPackageJsonImportsOnlyFromClosestScope1
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard1
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard2
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard3
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard4
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard5
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard6
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard7
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard8
-TestPathCompletionsPackageJsonImportsSrcNoDistWildcard9
-TestPathCompletionsPackageJsonImportsWildcard1
-TestPathCompletionsPackageJsonImportsWildcard10
-TestPathCompletionsPackageJsonImportsWildcard11
-TestPathCompletionsPackageJsonImportsWildcard12
-TestPathCompletionsPackageJsonImportsWildcard2
-TestPathCompletionsPackageJsonImportsWildcard3
-TestPathCompletionsPackageJsonImportsWildcard4
-TestPathCompletionsPackageJsonImportsWildcard5
-TestPathCompletionsPackageJsonImportsWildcard6
-TestPathCompletionsPackageJsonImportsWildcard7
-TestPathCompletionsPackageJsonImportsWildcard8
-TestPathCompletionsPackageJsonImportsWildcard9
-TestPathCompletionsTypesVersionsLocal
-TestPathCompletionsTypesVersionsWildcard1
-TestPathCompletionsTypesVersionsWildcard2
-TestPathCompletionsTypesVersionsWildcard3
-TestPathCompletionsTypesVersionsWildcard4
-TestPathCompletionsTypesVersionsWildcard5
-TestPathCompletionsTypesVersionsWildcard6
 TestProtoVarVisibleWithOuterScopeUnderscoreProto
 TestQualifyModuleTypeNames
 TestQuickInfo_notInsideComment
@@ -666,12 +559,6 @@ TestTabbingAfterNewlineInsertedBeforeWhile
 TestThisBindingInLambda
 TestThisPredicateFunctionQuickInfo01
 TestThisPredicateFunctionQuickInfo02
-TestTripleSlashRefPathCompletionAbsolutePaths
-TestTripleSlashRefPathCompletionContext
-TestTripleSlashRefPathCompletionExtensionsAllowJSFalse
-TestTripleSlashRefPathCompletionExtensionsAllowJSTrue
-TestTripleSlashRefPathCompletionHiddenFile
-TestTripleSlashRefPathCompletionRootdirs
 TestTsxCompletionNonTagLessThan
 TestTsxQuickInfo1
 TestTsxQuickInfo4

internal/fourslash/_scripts/manualTests.txt

@@ -1,15 +1,30 @@
+autoCloseFragment
+autoCloseTag
 autoImportPackageRootPathTypeModule
+completionForStringLiteral_details
+completionForStringLiteralExport
+completionForStringLiteralImport1
+completionForStringLiteralImport2
+completionForStringLiteralNonrelativeImport12
+completionForStringLiteralNonrelativeImport14
+completionForStringLiteralNonrelativeImport16
+completionForStringLiteralNonrelativeImport4
+completionForStringLiteralNonrelativeImport8
+completionForStringLiteralRelativeImport4
+completionForStringLiteralWithDynamicImport
 completionListInClosedFunction05
+completionListInImportClause05
 completionListWithLabel
 completionsAtIncompleteObjectLiteralProperty
 completionsImport_defaultAndNamedConflict
 completionsImport_filteredByPackageJson_ambient
 completionsImport_reExportDefault
 completionsImport_reexportTransient
+completionsPaths_importType
+completionsPaths_pathMapping_nonTrailingWildcard1
 completionsSelfDeclaring1
 completionsWithDeprecatedTag4
 completionsWithStringReplacementMode1
-formatOnEnterInComment
 duplicatePackageServices_fileChanges
 exhaustiveCaseCompletions1
 exhaustiveCaseCompletions2
@@ -19,6 +34,8 @@ exhaustiveCaseCompletions5
 exhaustiveCaseCompletions6
 exhaustiveCaseCompletions7
 exhaustiveCaseCompletions8
+formatOnEnterInComment
+formattingFatArrowFunctions
 getOutliningSpans
 importNameCodeFix_uriStyleNodeCoreModules1
 importNameCodeFixDefaultExport7
@@ -41,26 +58,27 @@ navto_excludeLib1
 navto_excludeLib2
 navto_excludeLib4
 navto_serverExcludeLib
+nodeModulesImportCompletions1
 outliningForNonCompleteInterfaceDeclaration
 outliningHintSpansForFunction
 parserCorruptionAfterMapInClass
+pathCompletionsPackageJsonExportsWildcard1
+pathCompletionsPackageJsonExportsWildcard12
+pathCompletionsPackageJsonExportsWildcard4
+pathCompletionsPackageJsonImportsSrcNoDistWildcard1
+pathCompletionsPackageJsonImportsSrcNoDistWildcard4
+pathCompletionsPackageJsonImportsWildcard1
+pathCompletionsPackageJsonImportsWildcard12
+pathCompletionsPackageJsonImportsWildcard4
+pathCompletionsTypesVersionsWildcard3
+pathCompletionsTypesVersionsWildcard4
+pathCompletionsTypesVersionsWildcard5
+pathCompletionsTypesVersionsWildcard6
 quickInfoForOverloadOnConst1
 renameDefaultKeyword
 renameForDefaultExport01
 semicolonFormattingInsideAComment
 semicolonFormattingInsideAStringLiteral
-tsxCompletion12
-jsDocFunctionSignatures2
-jsDocFunctionSignatures12
-getOutliningSpans
-incrementalParsingWithJsDoc
-autoCloseFragment
-autoCloseTag
-completionsWithStringReplacementMode1
-jsdocParameterNameCompletion
 stringLiteralCompletionsInPositionTypedUsingRest
+tripleSlashRefPathCompletionAbsolutePaths
 tsxCompletion12
-importNameCodeFix_uriStyleNodeCoreModules1
-importNameCodeFixDefaultExport7
-importNameCodeFixOptionalImport0
-formattingFatArrowFunctions

internal/fourslash/fourslash.go

@@ -1158,6 +1158,7 @@ func (f *FourslashTest) VerifyCompletions(t *testing.T, markerInput MarkerInput,
 }
 
 func (f *FourslashTest) verifyCompletionsWorker(t *testing.T, expected *CompletionsExpectedList) *lsproto.CompletionList {
+	t.Helper()
 	prefix := f.getCurrentPositionPrefix()
 	var userPreferences *lsutil.UserPreferences
 	if expected != nil {
@@ -1169,6 +1170,7 @@ func (f *FourslashTest) verifyCompletionsWorker(t *testing.T, expected *Completi
 }
 
 func (f *FourslashTest) getCompletions(t *testing.T, userPreferences *lsutil.UserPreferences) *lsproto.CompletionList {
+	t.Helper()
 	params := &lsproto.CompletionParams{
 		TextDocument: lsproto.TextDocumentIdentifier{
 			Uri: lsconv.FileNameToDocumentURI(f.activeFilename),
@@ -1202,6 +1204,9 @@ func (f *FourslashTest) verifyCompletionsResult(
 		}
 		return
 	} else if expected == nil {
+		if len(actual.Items) == 0 {
+			return
+		}
 		// !!! cmp.Diff(actual, nil) should probably be a .String() call here and elswhere
 		t.Fatalf(prefix+"Expected nil completion list but got non-nil: %s", cmp.Diff(actual, nil))
 	}
@@ -3505,6 +3510,7 @@ func (f *FourslashTest) getCurrentPositionPrefix() string {
 }
 
 func (f *FourslashTest) BaselineAutoImportsCompletions(t *testing.T, markerNames []string) {
+	t.Helper()
 	reset := f.ConfigureWithReset(t, &lsutil.UserPreferences{
 		IncludeCompletionsForModuleExports:    core.TSTrue,
 		IncludeCompletionsForImportStatements: core.TSTrue,

internal/fourslash/tests/autoImportCompletion_test.go

@@ -120,43 +120,3 @@ b/**/
 	})
 	f.BaselineAutoImportsCompletions(t, []string{""})
 }
-
-func TestNodeModulesImportCompletions1Baseline(t *testing.T) {
-	t.Parallel()
-	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
-	const content = `// @allowJs: true
-// @module: node18
-// @Filename: /src/module.mts
-export {}
-// @Filename: /src/module.cts
-export {}
-// @Filename: /src/module.js
-export {}
-// @Filename: /src/decl.d.mts
-export {}
-// @Filename: /src/decl.d.cts
-export {}
-// @Filename: /src/decl.d.ts
-export {}
-// @Filename: /src/js.mjs
-export {}
-// @Filename: /src/js.cjs
-export {}
-// @Filename: /src/js.js
-export {}
-// @Filename: /main.mts
-import {} from "./src//*1*/"; //note, this test should not work until packagejsonautoimportprovider is implemented
-import mod = require("./src//*2*/");
-const m = import("./src//*3*/");
-// @Filename: /main.cts
-import {} from "./src//*4*/";
-import mod = require("./src//*5*/");
-const m = import("./src//*6*/");
-// @Filename: /main.ts
-import {} from "./src//*7*/";
-import mod = require("./src//*8*/");
-const m = import("./src//*9*/");`
-	f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content)
-	defer done()
-	f.BaselineAutoImportsCompletions(t, []string{"1", "3", "6", "9", "2", "4", "5", "7", "8"})
-}