Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion microsoft/typescript-go
Submodule typescript-go updated 128 files
2 changes: 1 addition & 1 deletion pkg/checker/grammarchecks.go
Original file line number Diff line number Diff line change
Expand Up @@ -2191,7 +2191,7 @@ func (c *Checker) checkGrammarImportCallExpression(node *ast.Node) bool {

nodeArguments := nodeAsCall.Arguments
argumentNodes := nodeArguments.Nodes
if c.moduleKind != core.ModuleKindESNext && c.moduleKind != core.ModuleKindNodeNext && c.moduleKind != core.ModuleKindNode16 && c.moduleKind != core.ModuleKindPreserve {
if !(core.ModuleKindNode16 <= c.moduleKind && c.moduleKind <= core.ModuleKindNodeNext) && c.moduleKind != core.ModuleKindESNext && c.moduleKind != core.ModuleKindPreserve {
// We are allowed trailing comma after proposal-import-assertions.
c.checkGrammarForDisallowedTrailingComma(nodeArguments, diagnostics.Trailing_comma_not_allowed)

Expand Down
12 changes: 6 additions & 6 deletions pkg/fourslash/_scripts/convertFourslash.mts
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ function parseVerifyApplyCodeActionArgs(arg: ts.Expression): string | undefined
return undefined;
}
}
props.push(`AutoImportData: &ls.AutoImportData{\n${dataProps.join("\n")}\n},`);
props.push(`AutoImportData: &lsproto.AutoImportData{\n${dataProps.join("\n")}\n},`);
break;
case "description":
descInit = getStringLiteralLike(init);
Expand Down Expand Up @@ -944,16 +944,16 @@ function parseExpectedCompletionItem(expr: ts.Expression, codeActionArgs?: Verif
if (sourceInit = getStringLiteralLike(init)) {
if (propName === "source" && sourceInit.text.endsWith("/")) {
// source: "ClassMemberSnippet/"
itemProps.push(`Data: PtrTo(any(&ls.CompletionItemData{
itemProps.push(`Data: &lsproto.CompletionItemData{
Source: ${getGoStringLiteral(sourceInit.text)},
})),`);
},`);
break;
}
itemProps.push(`Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
itemProps.push(`Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: ${getGoStringLiteral(sourceInit.text)},
},
})),`);
},`);
}
else {
console.error(`Expected string literal for source/sourceDisplay, got ${init.getText()}`);
Expand Down
38 changes: 15 additions & 23 deletions pkg/fourslash/fourslash.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,13 @@ func (f *FourslashTest) nextID() int32 {
}

func (f *FourslashTest) initialize(t *testing.T, capabilities *lsproto.ClientCapabilities) {
initOptions := map[string]any{
// Hack: disable push diagnostics entirely, since the fourslash runner does not
// yet gracefully handle non-request messages.
"disablePushDiagnostics": true,
}
params := &lsproto.InitializeParams{
Locale: ptrTo("en-US"),
InitializationOptions: ptrTo[any](initOptions),
Locale: ptrTo("en-US"),
InitializationOptions: &lsproto.InitializationOptions{
// Hack: disable push diagnostics entirely, since the fourslash runner does not
// yet gracefully handle non-request messages.
DisablePushDiagnostics: ptrTo(true),
},
}
params.Capabilities = getCapabilitiesWithDefaults(capabilities)
// !!! check for errors?
Expand Down Expand Up @@ -717,8 +716,8 @@ func (f *FourslashTest) VerifyCompletions(t *testing.T, markerInput MarkerInput,
if item.Label != expectedAction.Name || item.Data == nil {
return false
}
data, ok := (*item.Data).(*ls.CompletionItemData)
if !ok || data.AutoImport == nil {
data := item.Data
if data.AutoImport == nil {
return false
}
return data.AutoImport.ModuleSpecifier == expectedAction.Source
Expand Down Expand Up @@ -956,16 +955,12 @@ var (
)

func (f *FourslashTest) verifyCompletionItem(t *testing.T, prefix string, actual *lsproto.CompletionItem, expected *lsproto.CompletionItem) {
var actualAutoImportData, expectedAutoImportData *ls.AutoImportData
var actualAutoImportData, expectedAutoImportData *lsproto.AutoImportData
if actual.Data != nil {
if data, ok := (*actual.Data).(*ls.CompletionItemData); ok {
actualAutoImportData = data.AutoImport
}
actualAutoImportData = actual.Data.AutoImport
}
if expected.Data != nil {
if data, ok := (*expected.Data).(*ls.CompletionItemData); ok {
expectedAutoImportData = data.AutoImport
}
expectedAutoImportData = expected.Data.AutoImport
}
if (actualAutoImportData == nil) != (expectedAutoImportData == nil) {
t.Fatal(prefix + "Mismatch in auto-import data presence")
Expand Down Expand Up @@ -1034,7 +1029,7 @@ func assertDeepEqual(t *testing.T, actual any, expected any, prefix string, opts
type ApplyCodeActionFromCompletionOptions struct {
Name string
Source string
AutoImportData *ls.AutoImportData
AutoImportData *lsproto.AutoImportData
Description string
NewFileContent *string
NewRangeContent *string
Expand All @@ -1058,16 +1053,13 @@ func (f *FourslashTest) VerifyApplyCodeActionFromCompletion(t *testing.T, marker
if item.Label != options.Name || item.Data == nil {
return false
}
data, ok := (*item.Data).(*ls.CompletionItemData)
if !ok {
return false
}
data := item.Data
if options.AutoImportData != nil {
return data.AutoImport != nil && ((data.AutoImport.FileName == options.AutoImportData.FileName) &&
(options.AutoImportData.ModuleSpecifier == "" || data.AutoImport.ModuleSpecifier == options.AutoImportData.ModuleSpecifier) &&
(options.AutoImportData.ExportName == "" || data.AutoImport.ExportName == options.AutoImportData.ExportName) &&
(options.AutoImportData.AmbientModuleName == nil || data.AutoImport.AmbientModuleName == options.AutoImportData.AmbientModuleName) &&
(options.AutoImportData.IsPackageJsonImport == core.TSUnknown || data.AutoImport.IsPackageJsonImport == options.AutoImportData.IsPackageJsonImport))
(options.AutoImportData.AmbientModuleName == "" || data.AutoImport.AmbientModuleName == options.AutoImportData.AmbientModuleName) &&
data.AutoImport.IsPackageJsonImport == options.AutoImportData.IsPackageJsonImport)
}
if data.AutoImport == nil && data.Source != "" && data.Source == options.Source {
return true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -57,9 +56,9 @@ export class MoveInsideNextQuote extends MoveQuoteMatch {/*1*/
InsertText: PtrTo("public execActionWithCount(position: Position): Promise<void> {\n}"),
FilterText: PtrTo("execActionWithCount"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -75,9 +74,9 @@ export = Container;`
InsertText: PtrTo("parent: Container_ | Document_ | undefined;"),
FilterText: PtrTo("parent"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -51,9 +50,9 @@ class FullPiece extends Piece {
InsertText: PtrTo("container: Container;"),
FilterText: PtrTo("container"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -59,9 +58,9 @@ class PingCommand extends Command {
InsertText: PtrTo("get container(): Container {\n}"),
FilterText: PtrTo("container"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -50,9 +49,9 @@ class FullPiece extends Piece {
InsertText: PtrTo("container: Container;"),
FilterText: PtrTo("container"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/buke/typescript-go-internal/pkg/fourslash"
. "github.com/buke/typescript-go-internal/pkg/fourslash/tests/util"
"github.com/buke/typescript-go-internal/pkg/ls"
"github.com/buke/typescript-go-internal/pkg/lsp/lsproto"
"github.com/buke/typescript-go-internal/pkg/testutil"
)
Expand Down Expand Up @@ -57,9 +56,9 @@ class PingCommand extends CommandAlias {
InsertText: PtrTo("get container(): Container {\n}"),
FilterText: PtrTo("container"),
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
Data: &lsproto.CompletionItemData{
Source: "ClassMemberSnippet/",
})),
},
},
},
},
Expand Down
12 changes: 6 additions & 6 deletions pkg/fourslash/tests/gen/autoImportFileExcludePatterns3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ declare module "foo" {
[]fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "x",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "foo",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
&lsproto.CompletionItem{
Label: "y",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "foo",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/fourslash/tests/gen/autoImportModuleNone2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ export const x: number;
Includes: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "x",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "dep",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
Expand Down
18 changes: 9 additions & 9 deletions pkg/fourslash/tests/gen/autoImportPathsAliasesAndBarrels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,31 +49,31 @@ func TestAutoImportPathsAliasesAndBarrels(t *testing.T) {
Includes: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "Thing2A",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "./thing2A",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
&lsproto.CompletionItem{
Label: "Thing1B",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "~/dirB",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
&lsproto.CompletionItem{
Label: "Thing2B",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "~/dirB",
},
})),
},
AdditionalTextEdits: fourslash.AnyTextEdits,
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/fourslash/tests/gen/autoImportProvider6_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ Component/**/`
&lsproto.CompletionItem{
Label: "Component",
AdditionalTextEdits: fourslash.AnyTextEdits,
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "react",
},
})),
},
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
},
},
Expand Down
12 changes: 6 additions & 6 deletions pkg/fourslash/tests/gen/autoImportProvider_exportMap1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ fooFrom/**/`
Includes: []fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "fooFromIndex",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "dependency",
},
})),
},
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
AdditionalTextEdits: fourslash.AnyTextEdits,
},
&lsproto.CompletionItem{
Label: "fooFromLol",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "dependency/lol",
},
})),
},
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
AdditionalTextEdits: fourslash.AnyTextEdits,
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/fourslash/tests/gen/autoImportProvider_exportMap2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ fooFrom/**/`
[]fourslash.CompletionsExpectedItem{
&lsproto.CompletionItem{
Label: "fooFromIndex",
Data: PtrTo(any(&ls.CompletionItemData{
AutoImport: &ls.AutoImportData{
Data: &lsproto.CompletionItemData{
AutoImport: &lsproto.AutoImportData{
ModuleSpecifier: "dependency",
},
})),
},
SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)),
AdditionalTextEdits: fourslash.AnyTextEdits,
},
Expand Down
Loading