fix relevant tokens order

Author: gabritto

internal/ls/completions.go

@@ -264,7 +264,7 @@ func (l *LanguageService) getCompletionsAtPosition(
 	preferences *UserPreferences,
 	clientOptions *lsproto.CompletionClientCapabilities,
 ) *lsproto.CompletionList {
-	previousToken, _ := getRelevantTokens(position, file)
+	_, previousToken := getRelevantTokens(position, file)
 	if context.TriggerCharacter != nil && !isInString(file, position, previousToken) && !isValidTrigger(file, *context.TriggerCharacter, previousToken, position) {
 		return nil
 	}
@@ -331,7 +331,7 @@ func getCompletionData(program *compiler.Program, file *ast.SourceFile, position
 	// The decision to provide completion depends on the contextToken, which is determined through the previousToken.
 	// Note: 'previousToken' (and thus 'contextToken') can be undefined if we are the beginning of the file
 	isJSOnlyLocation := !insideJSDocTagTypeExpression && !insideJsDocImportTag && ast.IsSourceFileJS(file)
-	previousToken, contextToken := getRelevantTokens(position, file)
+	contextToken, previousToken := getRelevantTokens(position, file)
 
 	// Find the node where completion is requested on.
 	// Also determine whether we are trying to complete with members of that node

internal/ls/completions_test.go

@@ -1766,6 +1766,43 @@ const bar: {
 				},
 			},
 		},
+		{
+			name: "extendsKeywordCompletion2",
+			files: map[string]string{
+				defaultMainFileName: `function f1<T /*1*/>() {}
+function f2<T ext/*2*/>() {}`,
+			},
+			expectedResult: map[string]*testCaseResult{
+				// "1": {
+				// 	list: &lsproto.CompletionList{
+				// 		IsIncomplete: false,
+				// 		ItemDefaults: itemDefaults,
+				// 		Items: []*lsproto.CompletionItem{
+				// 			{
+				// 				Label:    "extends",
+				// 				Kind:     keywordKind,
+				// 				SortText: sortTextGlobalsOrKeywords,
+				// 			},
+				// 		},
+				// 	},
+				// 	isIncludes: true,
+				// },
+				"2": {
+					list: &lsproto.CompletionList{
+						IsIncomplete: false,
+						ItemDefaults: itemDefaults,
+						Items: []*lsproto.CompletionItem{
+							{
+								Label:    "extends",
+								Kind:     keywordKind,
+								SortText: sortTextGlobalsOrKeywords,
+							},
+						},
+					},
+					isIncludes: true,
+				},
+			},
+		},
 	}
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {