added gating for user preferences for auto imports

internal/fourslash/fourslash.go

@@ -2169,6 +2169,11 @@ func (f *FourslashTest) BaselineAutoImportsCompletions(t *testing.T, markerNames
 	reset := f.ConfigureWithReset(t, &lsutil.UserPreferences{
 		IncludeCompletionsForModuleExports:    core.TSTrue,
 		IncludeCompletionsForImportStatements: core.TSTrue,
+		ImportModuleSpecifierEnding:           f.userPreferences.ImportModuleSpecifierEnding,
+		ImportModuleSpecifierPreference:       f.userPreferences.ImportModuleSpecifierPreference,
+		AutoImportFileExcludePatterns:         f.userPreferences.AutoImportFileExcludePatterns,
+		AutoImportSpecifierExcludeRegexes:     f.userPreferences.AutoImportSpecifierExcludeRegexes,
+		PreferTypeOnlyAutoImports:             f.userPreferences.PreferTypeOnlyAutoImports,
 	})
 	defer reset()
 

internal/fourslash/tests/autoImportFileExcludePatterns_test.go

@@ -0,0 +1,53 @@
+package fourslash_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/fourslash"
+	. "github.com/microsoft/typescript-go/internal/fourslash/tests/util"
+	"github.com/microsoft/typescript-go/internal/ls/lsutil"
+	"github.com/microsoft/typescript-go/internal/testutil"
+)
+
+func TestAutoImportFileExcludePatterns(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: foo.ts
+export const mySymbol = 1;
+// @Filename: ignoreme.ts
+export const ignoredSymbol = 2;
+// @Filename: bar.ts
+mySym/*1*/
+ignoredSym/*2*/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		AutoImportFileExcludePatterns:         []string{"*ignoreme.ts"},
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+	})
+
+	// Verify that mySymbol is included, but ignoredSymbol is excluded from completions
+	f.VerifyCompletions(t, "1", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"mySymbol"},
+		},
+	})
+	f.VerifyCompletions(t, "2", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Excludes: []string{"ignoredSymbol"},
+		},
+	})
+
+	// Baseline the auto-imports
+	f.BaselineAutoImportsCompletions(t, []string{"1", "2"})
+}

internal/fourslash/tests/autoImportSpecifierExcludeRegexes_test.go

@@ -0,0 +1,53 @@
+package fourslash_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/fourslash"
+	. "github.com/microsoft/typescript-go/internal/fourslash/tests/util"
+	"github.com/microsoft/typescript-go/internal/ls/lsutil"
+	"github.com/microsoft/typescript-go/internal/testutil"
+)
+
+func TestAutoImportSpecifierExcludeRegexes(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: foo.ts
+export const mySymbol = 1;
+// @Filename: ignoreme.ts
+export const ignoredSymbol = 2;
+// @Filename: bar.ts
+mySym/*1*/
+ignoredSym/*2*/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		AutoImportSpecifierExcludeRegexes:     []string{".*ignoreme.*"},
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+	})
+
+	// Verify that mySymbol is included, but ignoredSymbol is excluded from completions
+	f.VerifyCompletions(t, "1", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"mySymbol"},
+		},
+	})
+	f.VerifyCompletions(t, "2", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Excludes: []string{"ignoredSymbol"},
+		},
+	})
+
+	// Baseline the auto-imports
+	f.BaselineAutoImportsCompletions(t, []string{"1", "2"})
+}

internal/fourslash/tests/importAllowRenameOfImportPath_test.go

@@ -0,0 +1,48 @@
+package fourslash_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/fourslash"
+	"github.com/microsoft/typescript-go/internal/ls/lsutil"
+	"github.com/microsoft/typescript-go/internal/testutil"
+)
+
+func TestAllowRenameOfImportPath(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /a.ts
+export const x = 0;
+// @Filename: /dir/index.ts
+export const x = 0;
+// @Filename: /b.ts
+import * as a from "./[|a|]";
+import * as dir from "./[|dir|]";
+import * as dir2 from "./dir/[|index|]";
+// @Filename: /c.js
+const a = require("./[|a|]");
+`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	prefsTrue := &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		AllowRenameOfImportPath:               core.TSTrue,
+	}
+	prefsFalse := &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		AllowRenameOfImportPath:               core.TSFalse,
+	}
+	markers := []string{"a", "dir", "index"}
+	f.Configure(t, prefsTrue)
+	f.GoToEachMarker(t, markers, func(marker *fourslash.Marker, index int) {
+		f.VerifyRenameSucceeded(t, prefsTrue)
+	})
+
+	f.Configure(t, prefsFalse)
+	f.GoToEachMarker(t, markers, func(marker *fourslash.Marker, index int) {
+		f.VerifyRenameFailed(t, prefsFalse)
+	})
+}

internal/fourslash/tests/importModuleSpecifierEnding_test.go

@@ -0,0 +1,116 @@
+package fourslash_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/core"
+	"github.com/microsoft/typescript-go/internal/fourslash"
+	. "github.com/microsoft/typescript-go/internal/fourslash/tests/util"
+	"github.com/microsoft/typescript-go/internal/ls/lsutil"
+	"github.com/microsoft/typescript-go/internal/modulespecifiers"
+	"github.com/microsoft/typescript-go/internal/testutil"
+)
+
+func TestImportModuleSpecifierEndingAuto(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /project/helper/index.ts
+export const helperFunc = () => {};
+// @Filename: /project/index.ts
+helper/**/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		ImportModuleSpecifierEnding:           modulespecifiers.ImportModuleSpecifierEndingPreferenceAuto,
+	})
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"helperFunc"},
+		},
+	})
+	f.BaselineAutoImportsCompletions(t, []string{""})
+}
+
+func TestImportModuleSpecifierEndingMinimal(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /project/helper/index.ts
+export const helperFunc = () => {};
+// @Filename: /project/index.ts
+helper/**/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		ImportModuleSpecifierEnding:           modulespecifiers.ImportModuleSpecifierEndingPreferenceMinimal,
+	})
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"helperFunc"},
+		},
+	})
+	f.BaselineAutoImportsCompletions(t, []string{""})
+}
+
+func TestImportModuleSpecifierEndingIndex(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /project/helper/index.ts
+export const helperFunc = () => {};
+// @Filename: /project/index.ts
+helper/**/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		ImportModuleSpecifierEnding:           modulespecifiers.ImportModuleSpecifierEndingPreferenceIndex,
+	})
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"helperFunc"},
+		},
+	})
+	f.BaselineAutoImportsCompletions(t, []string{""})
+}
+
+func TestImportModuleSpecifierEndingJs(t *testing.T) {
+	t.Parallel()
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /project/helper/index.ts
+export const helperFunc = () => {};
+// @Filename: /project/index.ts
+helper/**/`
+
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.Configure(t, &lsutil.UserPreferences{
+		IncludeCompletionsForModuleExports:    core.TSTrue,
+		IncludeCompletionsForImportStatements: core.TSTrue,
+		ImportModuleSpecifierEnding:           modulespecifiers.ImportModuleSpecifierEndingPreferenceJs,
+	})
+	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{
+		ItemDefaults: &fourslash.CompletionsExpectedItemDefaults{
+			CommitCharacters: &DefaultCommitCharacters,
+			EditRange:        Ignored,
+		},
+		Items: &fourslash.CompletionsExpectedItems{
+			Includes: []fourslash.CompletionsExpectedItem{"helperFunc"},
+		},
+	})
+	f.BaselineAutoImportsCompletions(t, []string{""})
+}