Update submodule, port 6.0 options defaults

internal/core/compileroptions.go

@@ -200,26 +200,30 @@ func (options *CompilerOptions) GetEmitScriptTarget() ScriptTarget {
 }
 
 func (options *CompilerOptions) GetEmitModuleKind() ModuleKind {
-	if options.Module != ModuleKindNone {
+	switch options.Module {
+	case ModuleKindNone, ModuleKindAMD, ModuleKindUMD, ModuleKindSystem:
+		if options.Target >= ScriptTargetES2015 {
+			return ModuleKindES2015
+		}
+		return ModuleKindCommonJS
+	default:
 		return options.Module
 	}
-	if options.Target >= ScriptTargetES2015 {
-		return ModuleKindES2015
-	}
-	return ModuleKindCommonJS
 }
 
 func (options *CompilerOptions) GetModuleResolutionKind() ModuleResolutionKind {
-	if options.ModuleResolution != ModuleResolutionKindUnknown {
-		return options.ModuleResolution
-	}
-	switch options.GetEmitModuleKind() {
-	case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20:
-		return ModuleResolutionKindNode16
-	case ModuleKindNodeNext:
-		return ModuleResolutionKindNodeNext
+	switch options.ModuleResolution {
+	case ModuleResolutionKindUnknown, ModuleResolutionKindClassic, ModuleResolutionKindNode10:
+		switch options.GetEmitModuleKind() {
+		case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20:
+			return ModuleResolutionKindNode16
+		case ModuleKindNodeNext:
+			return ModuleResolutionKindNodeNext
+		default:
+			return ModuleResolutionKindBundler
+		}
 	default:
-		return ModuleResolutionKindBundler
+		return options.ModuleResolution
 	}
 }
 
@@ -251,24 +255,14 @@ func (options *CompilerOptions) AllowImportingTsExtensionsFrom(fileName string)
 	return options.GetAllowImportingTsExtensions() || tspath.IsDeclarationFileName(fileName)
 }
 
+// Deprecated: always returns true
 func (options *CompilerOptions) GetESModuleInterop() bool {
-	if options.ESModuleInterop != TSUnknown {
-		return options.ESModuleInterop == TSTrue
-	}
-	switch options.GetEmitModuleKind() {
-	case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20, ModuleKindNodeNext, ModuleKindPreserve:
-		return true
-	}
-	return false
+	return true
 }
 
+// Deprecated: always returns true
 func (options *CompilerOptions) GetAllowSyntheticDefaultImports() bool {
-	if options.AllowSyntheticDefaultImports != TSUnknown {
-		return options.AllowSyntheticDefaultImports == TSTrue
-	}
-	return options.GetESModuleInterop() ||
-		options.GetEmitModuleKind() == ModuleKindSystem ||
-		options.GetModuleResolutionKind() == ModuleResolutionKindBundler
+	return true
 }
 
 func (options *CompilerOptions) GetResolveJsonModule() bool {
@@ -401,6 +395,7 @@ const (
 type ModuleKind int32
 
 const (
+	// Deprecated: Do not use outside of options parsing and validation.
 	ModuleKindNone     ModuleKind = 0
 	ModuleKindCommonJS ModuleKind = 1
 	// Deprecated: Do not use outside of options parsing and validation.
@@ -447,6 +442,10 @@ type ModuleResolutionKind int32
 
 const (
 	ModuleResolutionKindUnknown ModuleResolutionKind = 0
+	// Deprecated: Do not use outside of options parsing and validation.
+	ModuleResolutionKindClassic ModuleResolutionKind = 1
+	// Deprecated: Do not use outside of options parsing and validation.
+	ModuleResolutionKindNode10 ModuleResolutionKind = 2
 	// Starting with node16, node's module resolver has significant departures from traditional cjs resolution
 	// to better support ECMAScript modules and their use within node - however more features are still being added.
 	// TypeScript's Node ESM support was introduced after Node 12 went end-of-life, and Node 14 is the earliest stable

internal/fourslash/_scripts/failingTests.txt

@@ -92,12 +92,10 @@ TestCompletionInJsDoc
 TestCompletionInUncheckedJSFile
 TestCompletionListBuilderLocations_VariableDeclarations
 TestCompletionListForDerivedType1
-TestCompletionListForTransitivelyExportedMembers04
 TestCompletionListFunctionExpression
 TestCompletionListInArrowFunctionInUnclosedCallSite01
 TestCompletionListInClassExpressionWithTypeParameter
 TestCompletionListInClassStaticBlocks
-TestCompletionListInImportClause01
 TestCompletionListInImportClause05
 TestCompletionListInImportClause06
 TestCompletionListInNamedClassExpression
@@ -138,7 +136,6 @@ TestCompletionOfAwaitPromise6
 TestCompletionOfAwaitPromise7
 TestCompletionOfInterfaceAndVar
 TestCompletionPreferredSuggestions1
-TestCompletionPropertyShorthandForObjectLiteral5
 TestCompletionWithConditionalOperatorMissingColon
 TestCompletionsAfterJSDoc
 TestCompletionsBeforeRestArg1
@@ -149,13 +146,12 @@ TestCompletionsClassMemberImportTypeNodeParameter4
 TestCompletionsElementAccessNumeric
 TestCompletionsExportImport
 TestCompletionsGenericTypeWithMultipleBases1
-TestCompletionsImportBaseUrl
 TestCompletionsImportOrExportSpecifier
 TestCompletionsImport_default_alreadyExistedWithRename
 TestCompletionsImport_default_anonymous
-TestCompletionsImport_default_didNotExistBefore
-TestCompletionsImport_default_exportDefaultIdentifier
+TestCompletionsImport_default_symbolName
 TestCompletionsImport_details_withMisspelledName
+TestCompletionsImport_exportEquals
 TestCompletionsImport_exportEquals_anonymous
 TestCompletionsImport_exportEquals_global
 TestCompletionsImport_filteredByInvalidPackageJson_direct
@@ -167,21 +163,18 @@ TestCompletionsImport_filteredByPackageJson_typesOnly
 TestCompletionsImport_importType
 TestCompletionsImport_jsxOpeningTagImportDefault
 TestCompletionsImport_mergedReExport
-TestCompletionsImport_multipleWithSameName
 TestCompletionsImport_named_didNotExistBefore
-TestCompletionsImport_named_exportEqualsNamespace
 TestCompletionsImport_named_namespaceImportExists
 TestCompletionsImport_noSemicolons
-TestCompletionsImport_ofAlias_preferShortPath
 TestCompletionsImport_packageJsonImportsPreference
 TestCompletionsImport_quoteStyle
-TestCompletionsImport_reExportDefault
 TestCompletionsImport_reExportDefault2
 TestCompletionsImport_reExport_wrongName
 TestCompletionsImport_require_addToExisting
 TestCompletionsImport_typeOnly
 TestCompletionsImport_umdDefaultNoCrash1
 TestCompletionsImport_uriStyleNodeCoreModules2
+TestCompletionsImport_weirdDefaultSynthesis
 TestCompletionsImport_windowsPathsProjectRelative
 TestCompletionsInExport
 TestCompletionsInExport_moduleBlock
@@ -280,7 +273,6 @@ TestImportCompletions_importsMap3
 TestImportCompletions_importsMap4
 TestImportCompletions_importsMap5
 TestImportNameCodeFixExportAsDefault
-TestImportSuggestionsCache_exportUndefined
 TestImportTypeCompletions1
 TestImportTypeCompletions3
 TestImportTypeCompletions4

internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers04_test.go

@@ -10,10 +10,9 @@ import (
 
 func TestCompletionListForTransitivelyExportedMembers04(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
-	const content = `// @ModuleResolution: classic
-// @Filename: A.ts
+	const content = `// @Filename: A.ts
 export interface I1 { one: number }
 export interface I2 { two: string }
 export type I1_OR_I2 = I1 | I2;
@@ -35,10 +34,10 @@ export module Inner {
 export var bVar = "bee!";
 // @Filename: C.ts
 export var cVar = "see!";
-export * from "A";
-export * from "B"
+export * from "./A";
+export * from "./B"
 // @Filename: D.ts
-import * as c from "C";
+import * as c from "./C";
 var x: c.Inner./**/`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{

internal/fourslash/tests/gen/completionListInImportClause01_test.go

@@ -10,21 +10,20 @@ import (
 
 func TestCompletionListInImportClause01(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
-	const content = `// @ModuleResolution: classic
-// @Filename: m1.ts
+	const content = `// @Filename: m1.ts
 export var foo: number = 1;
 export function bar() { return 10; }
 export function baz() { return 10; }
 // @Filename: m2.ts
-import {/*1*/, /*2*/ from "m1"
-import {/*3*/} from "m1"
-import {foo,/*4*/ from "m1"
-import {bar as /*5*/, /*6*/ from "m1"
-import {foo, bar, baz as b,/*7*/} from "m1"
-import { type /*8*/ } from "m1";
-import { type b/*9*/ } from "m1";`
+import {/*1*/, /*2*/ from "./m1"
+import {/*3*/} from "./m1"
+import {foo,/*4*/ from "./m1"
+import {bar as /*5*/, /*6*/ from "./m1"
+import {foo, bar, baz as b,/*7*/} from "./m1"
+import { type /*8*/ } from "./m1";
+import { type b/*9*/ } from "./m1";`
 	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
 	f.VerifyCompletions(t, []string{"8", "9"}, &fourslash.CompletionsExpectedList{
 		IsIncomplete: false,

internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral5_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionPropertyShorthandForObjectLiteral5(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: esnext
 // @Filename: /a.ts
@@ -33,7 +33,7 @@ const obj = { exp/**/`
 					Label: "exportedConstant",
 					Data: PtrTo(any(&ls.CompletionItemData{
 						AutoImport: &ls.AutoImportData{
-							ModuleSpecifier: "/a",
+							ModuleSpecifier: "./a",
 						},
 					})),
 					AdditionalTextEdits: fourslash.AnyTextEdits,

internal/fourslash/tests/gen/completionsImportBaseUrl_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImportBaseUrl(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /tsconfig.json
 {
@@ -38,7 +38,7 @@ fo/**/`
 					Label: "foo",
 					Data: PtrTo(any(&ls.CompletionItemData{
 						AutoImport: &ls.AutoImportData{
-							ModuleSpecifier: "/src/a",
+							ModuleSpecifier: "./a",
 						},
 					})),
 					Detail:              PtrTo("const foo: 0"),

internal/fourslash/tests/gen/completionsImport_default_anonymous_test.go

@@ -46,7 +46,7 @@ fooB/*1*/`
 					Label: "fooBar",
 					Data: PtrTo(any(&ls.CompletionItemData{
 						AutoImport: &ls.AutoImportData{
-							ModuleSpecifier: "/src/foo-bar",
+							ModuleSpecifier: "./foo-bar",
 						},
 					})),
 					Detail:              PtrTo("(property) default: 0"),
@@ -59,7 +59,7 @@ fooB/*1*/`
 	})
 	f.VerifyApplyCodeActionFromCompletion(t, PtrTo("1"), &fourslash.ApplyCodeActionFromCompletionOptions{
 		Name:        "fooBar",
-		Source:      "/src/foo-bar",
+		Source:      "./foo-bar",
 		Description: "Add import from \"./foo-bar\"",
 		NewFileContent: PtrTo(`import fooBar from "./foo-bar"
 

internal/fourslash/tests/gen/completionsImport_default_didNotExistBefore_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImport_default_didNotExistBefore(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: esnext
 // @Filename: /a.ts
@@ -32,7 +32,7 @@ f/**/;`
 					Label: "foo",
 					Data: PtrTo(any(&ls.CompletionItemData{
 						AutoImport: &ls.AutoImportData{
-							ModuleSpecifier: "/a",
+							ModuleSpecifier: "./a",
 						},
 					})),
 					Detail:              PtrTo("function foo(): void"),
@@ -45,7 +45,7 @@ f/**/;`
 	})
 	f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{
 		Name:        "foo",
-		Source:      "/a",
+		Source:      "./a",
 		Description: "Add import from \"./a\"",
 		NewFileContent: PtrTo(`import foo from "./a";
 

internal/fourslash/tests/gen/completionsImport_default_exportDefaultIdentifier_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImport_default_exportDefaultIdentifier(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: esnext
 // @Filename: /a.ts
@@ -34,7 +34,7 @@ f/**/;`
 					Label: "foo",
 					Data: PtrTo(any(&ls.CompletionItemData{
 						AutoImport: &ls.AutoImportData{
-							ModuleSpecifier: "/a",
+							ModuleSpecifier: "./a",
 						},
 					})),
 					Detail:              PtrTo("(alias) const foo: 0\nexport default foo"),
@@ -47,7 +47,7 @@ f/**/;`
 	})
 	f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{
 		Name:        "foo",
-		Source:      "/a",
+		Source:      "./a",
 		Description: "Add import from \"./a\"",
 		NewFileContent: PtrTo(`import foo from "./a";
 

internal/fourslash/tests/gen/completionsImport_default_symbolName_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImport_default_symbolName(t *testing.T) {
 	t.Parallel()
-
+	t.Skip()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: commonjs
 // @esModuleInterop: false

internal/fourslash/tests/gen/completionsImport_exportEquals_anonymous_test.go

@@ -60,7 +60,7 @@ fooB/*1*/`
 				}, true),
 		},
 	})
-	f.VerifyApplyCodeActionFromCompletion(t, PtrTo("0"), &fourslash.ApplyCodeActionFromCompletionOptions{
+	f.VerifyApplyCodeActionFromCompletion(t, PtrTo("1"), &fourslash.ApplyCodeActionFromCompletionOptions{
 		Name:        "fooBar",
 		Source:      "./foo-bar",
 		Description: "Add import from \"./foo-bar\"",

internal/fourslash/tests/gen/completionsImport_exportEquals_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImport_exportEquals(t *testing.T) {
 	t.Parallel()
-
+	t.Skip()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: commonjs
 // @esModuleInterop: false

internal/fourslash/tests/gen/completionsImport_multipleWithSameName_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestCompletionsImport_multipleWithSameName(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @module: esnext
 // @noLib: true
@@ -45,7 +45,7 @@ fo/**/`
 						Label: "foo",
 						Data: PtrTo(any(&ls.CompletionItemData{
 							AutoImport: &ls.AutoImportData{
-								ModuleSpecifier: "/a",
+								ModuleSpecifier: "./a",
 							},
 						})),
 						Detail:              PtrTo("const foo: 0"),
@@ -57,7 +57,7 @@ fo/**/`
 						Label: "foo",
 						Data: PtrTo(any(&ls.CompletionItemData{
 							AutoImport: &ls.AutoImportData{
-								ModuleSpecifier: "/b",
+								ModuleSpecifier: "./b",
 							},
 						})),
 						Detail:              PtrTo("const foo: 1"),
@@ -70,7 +70,7 @@ fo/**/`
 	})
 	f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{
 		Name:        "foo",
-		Source:      "/b",
+		Source:      "./b",
 		Description: "Add import from \"./b\"",
 		NewFileContent: PtrTo(`import { foo } from "./b";