noslash

cmd/tsgo/lsp.go

@@ -39,8 +39,8 @@ func runLSP(args []string) int {
 	defaultLibraryPath := bundled.LibPath()
 
 	s := lsp.NewServer(&lsp.ServerOptions{
-		In:                 os.Stdin,
-		Out:                os.Stdout,
+		In:                 lsp.ToLSPReader(os.Stdin),
+		Out:                lsp.ToLSPWriter(os.Stdout),
 		Err:                os.Stderr,
 		Cwd:                core.Must(os.Getwd()),
 		FS:                 fs,

internal/api/api.go

@@ -214,7 +214,7 @@ func (api *API) ParseConfigFile(configFileName string) (*ConfigFileResponse, err
 func (api *API) LoadProject(configFileName string) (*ProjectResponse, error) {
 	configFileName = api.toAbsoluteFileName(configFileName)
 	configFilePath := api.toPath(configFileName)
-	p := project.NewConfiguredProject(configFileName, configFilePath, api)
+	p := project.NewConfiguredProject(configFileName, configFilePath, api, nil /*getCachedSourceFile*/)
 	if err := p.LoadConfig(); err != nil {
 		return nil, err
 	}

internal/ls/completions.go

@@ -31,12 +31,16 @@ func (l *LanguageService) ProvideCompletion(
 	preferences *UserPreferences,
 ) (*lsproto.CompletionList, error) {
 	program, file := l.getProgramAndFile(documentURI)
+	var triggerCharacter *string
+	if context != nil {
+		triggerCharacter = context.TriggerCharacter
+	}
 	return l.getCompletionsAtPosition(
 		ctx,
 		program,
 		file,
 		int(l.converters.LineAndCharacterToPosition(file, position)),
-		context,
+		triggerCharacter,
 		preferences,
 		clientOptions,
 	), nil
@@ -272,16 +276,16 @@ func (l *LanguageService) getCompletionsAtPosition(
 	program *compiler.Program,
 	file *ast.SourceFile,
 	position int,
-	context *lsproto.CompletionContext,
+	triggerCharacter *string,
 	preferences *UserPreferences,
 	clientOptions *lsproto.CompletionClientCapabilities,
 ) *lsproto.CompletionList {
 	_, previousToken := getRelevantTokens(position, file)
-	if context.TriggerCharacter != nil && !IsInString(file, position, previousToken) && !isValidTrigger(file, *context.TriggerCharacter, previousToken, position) {
+	if triggerCharacter != nil && !IsInString(file, position, previousToken) && !isValidTrigger(file, *triggerCharacter, previousToken, position) {
 		return nil
 	}
 
-	if context.TriggerCharacter != nil && *context.TriggerCharacter == " " {
+	if triggerCharacter != nil && *triggerCharacter == " " {
 		// `isValidTrigger` ensures we are at `import |`
 		if ptrIsTrue(preferences.IncludeCompletionsForImportStatements) {
 			return &lsproto.CompletionList{
@@ -1886,7 +1890,7 @@ func (l *LanguageService) createCompletionItem(
 		insertText = origin.asObjectLiteralMethod().insertText
 		isSnippet = origin.asObjectLiteralMethod().isSnippet
 		labelDetails = origin.asObjectLiteralMethod().labelDetails // !!! check if this can conflict with case above where we set label details
-		if !ptrIsTrue(clientOptions.CompletionItem.LabelDetailsSupport) {
+		if !clientSupportsItemLabelDetails(clientOptions) {
 			name = name + *origin.asObjectLiteralMethod().labelDetails.Detail
 			labelDetails = nil
 		}
@@ -1896,7 +1900,7 @@ func (l *LanguageService) createCompletionItem(
 
 	if data.isJsxIdentifierExpected &&
 		!data.isRightOfOpenTag &&
-		ptrIsTrue(clientOptions.CompletionItem.SnippetSupport) &&
+		clientSupportsItemSnippet(clientOptions) &&
 		!jsxAttributeCompletionStyleIs(preferences.JsxAttributeCompletionStyle, JsxAttributeCompletionStyleNone) &&
 		!(ast.IsJsxAttribute(data.location.Parent) && data.location.Parent.Initializer() != nil) {
 		useBraces := jsxAttributeCompletionStyleIs(preferences.JsxAttributeCompletionStyle, JsxAttributeCompletionStyleBraces)
@@ -1964,10 +1968,10 @@ func (l *LanguageService) createCompletionItem(
 
 	elementKind := getSymbolKind(typeChecker, symbol, data.location)
 	var commitCharacters *[]string
-	if ptrIsTrue(clientOptions.CompletionItem.CommitCharactersSupport) {
+	if clientSupportsItemCommitCharacters(clientOptions) {
 		if elementKind == ScriptElementKindWarning || elementKind == ScriptElementKindString {
 			commitCharacters = &[]string{}
-		} else if !supportsDefaultCommitCharacters(clientOptions) {
+		} else if !clientSupportsDefaultCommitCharacters(clientOptions) {
 			commitCharacters = ptrTo(data.defaultCommitCharacters)
 		}
 		// Otherwise use the completion list default.
@@ -1998,11 +2002,6 @@ func (l *LanguageService) createCompletionItem(
 	)
 }
 
-func supportsDefaultCommitCharacters(clientOptions *lsproto.CompletionClientCapabilities) bool {
-	return clientOptions.CompletionList.ItemDefaults != nil &&
-		slices.Contains(*clientOptions.CompletionList.ItemDefaults, "commitCharacters")
-}
-
 func isRecommendedCompletionMatch(localSymbol *ast.Symbol, recommendedCompletion *ast.Symbol, typeChecker *checker.Checker) bool {
 	return localSymbol == recommendedCompletion ||
 		localSymbol.Flags&ast.SymbolFlagsExportValue != 0 && typeChecker.GetExportSymbolOfSymbol(localSymbol) == recommendedCompletion
@@ -3889,8 +3888,8 @@ func setCommitCharacters(
 	defaultCommitCharacters *[]string,
 ) *lsproto.CompletionItemDefaults {
 	var itemDefaults *lsproto.CompletionItemDefaults
-	supportsItemCommitCharacters := ptrIsTrue(clientOptions.CompletionItem.CommitCharactersSupport)
-	if supportsDefaultCommitCharacters(clientOptions) && supportsItemCommitCharacters {
+	supportsItemCommitCharacters := clientSupportsItemCommitCharacters(clientOptions)
+	if clientSupportsDefaultCommitCharacters(clientOptions) && supportsItemCommitCharacters {
 		itemDefaults = &lsproto.CompletionItemDefaults{
 			CommitCharacters: defaultCommitCharacters,
 		}
@@ -4027,7 +4026,7 @@ func (l *LanguageService) createLSPCompletionItem(
 		}
 	} else {
 		// Ported from vscode ts extension.
-		if optionalReplacementSpan != nil && ptrIsTrue(clientOptions.CompletionItem.InsertReplaceSupport) {
+		if optionalReplacementSpan != nil && clientSupportsItemInsertReplace(clientOptions) {
 			insertRange := &lsproto.Range{
 				Start: optionalReplacementSpan.Start,
 				End:   l.createLspPosition(position, file),
@@ -4056,7 +4055,7 @@ func (l *LanguageService) createLSPCompletionItem(
 			filterText = accessorText + core.IfElse(insertText != "", insertText, name)
 			if textEdit == nil {
 				insertText = filterText
-				if wordRange != nil && ptrIsTrue(clientOptions.CompletionItem.InsertReplaceSupport) {
+				if wordRange != nil && clientSupportsItemInsertReplace(clientOptions) {
 					textEdit = &lsproto.TextEditOrInsertReplaceEdit{
 						InsertReplaceEdit: &lsproto.InsertReplaceEdit{
 							NewText: insertText,
@@ -4200,3 +4199,30 @@ func (l *LanguageService) getLabelStatementCompletions(
 	}
 	return items
 }
+
+func hasCompletionItem(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	return clientOptions != nil && clientOptions.CompletionItem != nil
+}
+
+func clientSupportsItemLabelDetails(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	return hasCompletionItem(clientOptions) && ptrIsTrue(clientOptions.CompletionItem.LabelDetailsSupport)
+}
+
+func clientSupportsItemSnippet(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	return hasCompletionItem(clientOptions) && ptrIsTrue(clientOptions.CompletionItem.SnippetSupport)
+}
+
+func clientSupportsItemCommitCharacters(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	return hasCompletionItem(clientOptions) && ptrIsTrue(clientOptions.CompletionItem.CommitCharactersSupport)
+}
+
+func clientSupportsItemInsertReplace(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	return hasCompletionItem(clientOptions) && ptrIsTrue(clientOptions.CompletionItem.InsertReplaceSupport)
+}
+
+func clientSupportsDefaultCommitCharacters(clientOptions *lsproto.CompletionClientCapabilities) bool {
+	if clientOptions == nil || clientOptions.CompletionList == nil || clientOptions.CompletionList.ItemDefaults == nil {
+		return false
+	}
+	return slices.Contains(*clientOptions.CompletionList.ItemDefaults, "commitCharacters")
+}

internal/ls/completions_test.go

@@ -1958,7 +1958,7 @@ func runTest(t *testing.T, files map[string]string, expected map[string]*testCas
 	var markerPositions map[string]*lstestutil.Marker
 	for fileName, content := range files {
 		if fileName == mainFileName {
-			testData := lstestutil.ParseTestData("", content, fileName)
+			testData := lstestutil.ParseTestData(t, content, fileName)
 			markerPositions = testData.MarkerPositions
 			parsedFiles[fileName] = testData.Files[0].Content // !!! Assumes no usage of @filename, markers only on main file
 		} else {

internal/ls_test/basicInterfaceMembers_test.go

@@ -0,0 +1,71 @@
+package ls_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/ls"
+	"github.com/microsoft/typescript-go/internal/lsp/lsproto"
+	"github.com/microsoft/typescript-go/internal/testutil/lstestutil"
+)
+
+const content = `export {};
+interface Point {
+    x: number;
+    y: number;
+}
+declare const p: Point;
+p./*a*/`
+
+func TestBasicInterfaceMembers(t *testing.T) {
+	t.Parallel()
+	f, done := lstestutil.NewFourslash(t, nil /*capabilities*/, content, "basicInterfaceMembers.ts")
+	f.VerifyCompletions(t, "a", lstestutil.VerifyCompletionsResult{
+		Exact: &lsproto.CompletionList{
+			IsIncomplete: false,
+			ItemDefaults: &lsproto.CompletionItemDefaults{
+				CommitCharacters: &lstestutil.DefaultCommitCharacters,
+			},
+			Items: []*lsproto.CompletionItem{
+				{
+					Label:      "x",
+					Kind:       lstestutil.PtrTo(lsproto.CompletionItemKindField),
+					SortText:   lstestutil.PtrTo(string(ls.SortTextLocationPriority)),
+					FilterText: lstestutil.PtrTo(".x"),
+					TextEdit: &lsproto.TextEditOrInsertReplaceEdit{
+						InsertReplaceEdit: &lsproto.InsertReplaceEdit{
+							NewText: "x",
+							Insert: lsproto.Range{
+								Start: lsproto.Position{Line: 6, Character: 2},
+								End:   lsproto.Position{Line: 6, Character: 2},
+							},
+							Replace: lsproto.Range{
+								Start: lsproto.Position{Line: 6, Character: 2},
+								End:   lsproto.Position{Line: 6, Character: 2},
+							},
+						},
+					},
+				},
+				{
+					Label:      "y",
+					Kind:       lstestutil.PtrTo(lsproto.CompletionItemKindField),
+					SortText:   lstestutil.PtrTo(string(ls.SortTextLocationPriority)),
+					FilterText: lstestutil.PtrTo(".y"),
+					TextEdit: &lsproto.TextEditOrInsertReplaceEdit{
+						InsertReplaceEdit: &lsproto.InsertReplaceEdit{
+							NewText: "y",
+							Insert: lsproto.Range{
+								Start: lsproto.Position{Line: 6, Character: 2},
+								End:   lsproto.Position{Line: 6, Character: 2},
+							},
+							Replace: lsproto.Range{
+								Start: lsproto.Position{Line: 6, Character: 2},
+								End:   lsproto.Position{Line: 6, Character: 2},
+							},
+						},
+					},
+				},
+			},
+		},
+	})
+	done()
+}