added userpref gating for package.json auto imports

Author: johnfav03

internal/ls/autoimports.go

@@ -1010,7 +1010,9 @@ func (l *LanguageService) getNewImportFixes(
 ) []*ImportFix /* FixAddNewImport | FixAddJsdocTypeImport */ {
 	isJs := tspath.HasJSFileExtension(sourceFile.FileName())
 	compilerOptions := l.GetProgram().Options()
-	// !!! packagejsonAutoimportProvider
+	// !!! if preferences.IncludePackageJsonAutoImports != "off" {
+	// 		!!! packagejsonAutoimportProvider
+	// !!! }
 	// getChecker := createGetChecker(program, host)// memoized typechecker based on `isFromPackageJson` bool
 
 	getModuleSpecifiers := func(moduleSymbol *ast.Symbol, checker *checker.Checker) ([]string, modulespecifiers.ResultKind) {
@@ -1345,6 +1347,10 @@ func forEachExternalModuleToImportFrom(
 		},
 	)
 
+	// if preferences.IncludePackageJsonAutoImports == "off" {
+	//     return;
+	// }
+
 	// !!! autoImportProvider
 	// if  autoImportProvider := useAutoImportProvider && l.getPackageJsonAutoImportProvider(); autoImportProvider != nil {
 	//     // start := timestamp();

internal/ls/completions.go

@@ -1187,7 +1187,9 @@ func (l *LanguageService) getCompletionData(
 		isValidTypeOnlyUseSite := ast.IsValidTypeOnlyAliasUseSite(location)
 
 		// !!! moduleSpecifierCache := host.getModuleSpecifierCache();
-		// !!! packageJsonAutoImportProvider := host.getPackageJsonAutoImportProvider();
+		// !!! if preferences.includePackageJsonAutoImports != "off" {
+		// 		!!! packageJsonAutoImportProvider := host.getPackageJsonAutoImportProvider();
+		// !!! }
 		addSymbolToList := func(info []*SymbolExportInfo, symbolName string, isFromAmbientModule bool, exportMapKey ExportInfoMapKey) []*SymbolExportInfo {
 			// Do a relatively cheap check to bail early if all re-exports are non-importable
 			// due to file location or package.json dependency filtering. For non-node16+

internal/ls/types.go

@@ -51,6 +51,7 @@ type UserPreferences struct {
 
 	ImportModuleSpecifierPreference       modulespecifiers.ImportModuleSpecifierPreference
 	ImportModuleSpecifierEndingPreference modulespecifiers.ImportModuleSpecifierEndingPreference
+	IncludePackageJsonAutoImports         modulespecifiers.IncludePackageJsonAutoImports
 	PreferTypeOnlyAutoImports             *bool
 	AutoImportSpecifierExcludeRegexes     []string
 	AutoImportFileExcludePatterns         []string
@@ -62,6 +63,7 @@ func (p *UserPreferences) ModuleSpecifierPreferences() modulespecifiers.UserPref
 	return modulespecifiers.UserPreferences{
 		ImportModuleSpecifierPreference:       p.ImportModuleSpecifierPreference,
 		ImportModuleSpecifierEndingPreference: p.ImportModuleSpecifierEndingPreference,
+		IncludePackageJsonAutoImports:         p.IncludePackageJsonAutoImports,
 		AutoImportSpecifierExcludeRegexes:     p.AutoImportSpecifierExcludeRegexes,
 	}
 }

internal/modulespecifiers/preferences.go

@@ -141,6 +141,7 @@ func getPreferredEnding(
 type ModuleSpecifierPreferences struct {
 	relativePreference                RelativePreferenceKind
 	getAllowedEndingsInPreferredOrder func(syntaxImpliedNodeFormat core.ResolutionMode) []ModuleSpecifierEnding
+	packageJsonAutoImports            PackageJsonAutoImports
 	excludeRegexes                    []string
 }
 
@@ -170,6 +171,17 @@ func getModuleSpecifierPreferences(
 			// all others are shortest
 		}
 	}
+
+	var packageJsonAutoImports PackageJsonAutoImports
+	switch prefs.IncludePackageJsonAutoImports {
+	case "on":
+		packageJsonAutoImports = PackageJsonAutoImportsOn
+	case "off":
+		packageJsonAutoImports = PackageJsonAutoImportsOff
+	default:
+		packageJsonAutoImports = PackageJsonAutoImportsAuto
+	}
+
 	filePreferredEnding := getPreferredEnding(
 		prefs,
 		host,
@@ -226,6 +238,7 @@ func getModuleSpecifierPreferences(
 	}
 
 	return ModuleSpecifierPreferences{
+		packageJsonAutoImports:            packageJsonAutoImports,
 		excludeRegexes:                    excludes,
 		relativePreference:                relativePreference,
 		getAllowedEndingsInPreferredOrder: getAllowedEndingsInPreferredOrder,

internal/modulespecifiers/specifiers.go

@@ -493,7 +493,7 @@ func getLocalModuleSpecifier(
 	}
 
 	var fromPackageJsonImports string
-	if !pathsOnly {
+	if !pathsOnly && preferences.packageJsonAutoImports != PackageJsonAutoImportsOff {
 		fromPackageJsonImports = tryGetModuleNameFromPackageJsonImports(
 			moduleFileName,
 			sourceDirectory,

internal/modulespecifiers/types.go

@@ -85,9 +85,19 @@ const (
 	ImportModuleSpecifierEndingPreferenceJs      ImportModuleSpecifierEndingPreference = "js"
 )
 
+type IncludePackageJsonAutoImports string
+
+const (
+	IncludePackageJsonAutoImportsNone IncludePackageJsonAutoImports = ""
+	IncludePackageJsonAutoImportsAuto IncludePackageJsonAutoImports = "auto"
+	IncludePackageJsonAutoImportsOn   IncludePackageJsonAutoImports = "on"
+	IncludePackageJsonAutoImportsOff  IncludePackageJsonAutoImports = "off"
+)
+
 type UserPreferences struct {
 	ImportModuleSpecifierPreference       ImportModuleSpecifierPreference
 	ImportModuleSpecifierEndingPreference ImportModuleSpecifierEndingPreference
+	IncludePackageJsonAutoImports         IncludePackageJsonAutoImports
 	AutoImportSpecifierExcludeRegexes     []string
 }
 
@@ -113,6 +123,14 @@ const (
 	ModuleSpecifierEndingTsExtension
 )
 
+type PackageJsonAutoImports uint8
+
+const (
+	PackageJsonAutoImportsAuto PackageJsonAutoImports = iota
+	PackageJsonAutoImportsOn
+	PackageJsonAutoImportsOff
+)
+
 type MatchingMode uint8
 
 const (