@@ -11,6 +11,7 @@ let inputFileSet: Set<string> | undefined;
1111const failingTestsPath = path . join ( import . meta. dirname , "failingTests.txt" ) ;
1212const failingTestsList = fs . readFileSync ( failingTestsPath , "utf-8" ) . split ( "\n" ) . map ( line => line . trim ( ) . substring ( 4 ) ) . filter ( line => line . length > 0 ) ;
1313const failingTests = new Set ( failingTestsList ) ;
14+ const helperFilePath = path . join ( import . meta. dirname , "../" , "tests" , "util_test.go" ) ;
1415
1516const outputDir = path . join ( import . meta. dirname , "../" , "tests" , "gen" ) ;
1617
@@ -183,6 +184,28 @@ function parseVerifyCompletionsArgs(args: readonly ts.Expression[]): VerifyCompl
183184 return cmds ;
184185}
185186
187+ const completionConstants = new Map ( [
188+ [ "completion.globals" , "completionGlobals" ] ,
189+ [ "completion.globalTypes" , "completionGlobalTypes" ] ,
190+ [ "completion.classElementKeywords" , "completionClassElementKeywords" ] ,
191+ [ "completion.classElementInJsKeywords" , "completionClassElementInJSKeywords" ] ,
192+ [ "completion.constructorParameterKeywords" , "completionConstructorParameterKeywords" ] ,
193+ [ "completion.functionMembersWithPrototype" , "completionFunctionMembersWithPrototype" ] ,
194+ [ "completion.functionMembers" , "completionFunctionMembers" ] ,
195+ [ "completion.typeKeywords" , "completionTypeKeywords" ] ,
196+ [ "completion.undefinedVarEntry" , "completionUndefinedVarItem" ] ,
197+ [ "completion.typeAssertionKeywords" , "completionTypeAssertionKeywords" ] ,
198+ ] ) ;
199+
200+ const completionPlus = new Map ( [
201+ [ "completion.globalsPlus" , "completionGlobalsPlus" ] ,
202+ [ "completion.globalTypesPlus" , "completionGlobalTypesPlus" ] ,
203+ [ "completion.functionMembersPlus" , "completionFunctionMembersPlus" ] ,
204+ [ "completion.functionMembersWithPrototypePlus" , "completionFunctionMembersWithPrototypePlus" ] ,
205+ [ "completion.globalsInJsPlus" , "completionGlobalsInJSPlus" ] ,
206+ [ "completion.typeKeywordsPlus" , "completionTypeKeywordsPlus" ] ,
207+ ] ) ;
208+
186209function parseVerifyCompletionArg ( arg : ts . Expression ) : VerifyCompletionsCmd | undefined {
187210 let marker : string | undefined ;
188211 let goArgs : VerifyCompletionsArgs | undefined ;
@@ -236,31 +259,84 @@ function parseVerifyCompletionArg(arg: ts.Expression): VerifyCompletionsCmd | un
236259 args : undefined ,
237260 } ;
238261 }
239- let expected = "[]fourslash.ExpectedCompletionItem{" ;
240- if ( ts . isArrayLiteralExpression ( init ) ) {
241- for ( const elem of init . elements ) {
262+ let expected : string ;
263+ const initText = init . getText ( ) ;
264+ if ( completionConstants . has ( initText ) ) {
265+ expected = completionConstants . get ( initText ) ! ;
266+ }
267+ else if ( completionPlus . keys ( ) . some ( funcName => initText . startsWith ( funcName ) ) ) {
268+ const tsFunc = completionPlus . keys ( ) . find ( funcName => initText . startsWith ( funcName ) ) ;
269+ const funcName = completionPlus . get ( tsFunc ! ) ! ;
270+ const items = ( init as ts . CallExpression ) . arguments [ 0 ] ;
271+ const opts = ( init as ts . CallExpression ) . arguments [ 1 ] ;
272+ if ( ! ts . isArrayLiteralExpression ( items ) ) {
273+ console . error ( `Expected array literal expression for completion.globalsPlus items, got ${ items . getText ( ) } ) ;
274+ return undefined ;
275+ }
276+ expected = `${ funcName } ;
277+ for ( const elem of items . elements ) {
242278 const result = parseExpectedCompletionItem ( elem ) ;
243279 if ( ! result ) {
244280 return undefined ;
245281 }
246282 expected += result + ", " ;
247283 }
284+ expected += "}" ;
285+ if ( opts ) {
286+ if ( ! ts . isObjectLiteralExpression ( opts ) ) {
287+ console . error ( `Expected object literal expression for completion.globalsPlus options, got ${ opts . getText ( ) } ) ;
288+ return undefined ;
289+ }
290+ const noLib = opts . properties [ 0 ] ;
291+ if ( noLib && ts . isPropertyAssignment ( noLib ) && noLib . name . getText ( ) === "noLib" ) {
292+ if ( noLib . initializer . kind === ts . SyntaxKind . TrueKeyword ) {
293+ expected += ", true" ;
294+ }
295+ else if ( noLib . initializer . kind === ts . SyntaxKind . FalseKeyword ) {
296+ expected += ", false" ;
297+ }
298+ else {
299+ console . error ( `Expected boolean literal for noLib, got ${ noLib . initializer . getText ( ) } ) ;
300+ return undefined ;
301+ }
302+ }
303+ else {
304+ console . error ( `Expected noLib property in completion.globalsPlus options, got ${ opts . getText ( ) } ) ;
305+ return undefined ;
306+ }
307+ }
308+ else if ( tsFunc === "completion.globalsPlus" || tsFunc === "completion.globalsInJsPlus" ) {
309+ expected += ", false" ; // Default for noLib
310+ }
311+ expected += ")" ;
248312 }
249313 else {
250- const result = parseExpectedCompletionItem ( init ) ;
251- if ( ! result ) {
252- return undefined ;
314+ expected = "[]fourslash.CompletionsExpectedItem{" ;
315+ if ( ts . isArrayLiteralExpression ( init ) ) {
316+ for ( const elem of init . elements ) {
317+ const result = parseExpectedCompletionItem ( elem ) ;
318+ if ( ! result ) {
319+ return undefined ;
320+ }
321+ expected += result + ", " ;
322+ }
323+ }
324+ else {
325+ const result = parseExpectedCompletionItem ( init ) ;
326+ if ( ! result ) {
327+ return undefined ;
328+ }
329+ expected += result ;
253330 }
254- expected += result ;
331+ expected += "}" ;
255332 }
256- expected += "}" ;
257333 if ( propName === "includes" ) {
258334 ( goArgs ??= { } ) . includes = expected ;
259335 }
260336 else {
261337 ( goArgs ??= { } ) . exact = expected ;
262338 }
263- break ; // !!! parse these args
339+ break ;
264340 case "excludes" :
265341 let excludes = "[]string{" ;
266342 if ( ts . isStringLiteral ( init ) ) {
@@ -286,7 +362,7 @@ function parseVerifyCompletionArg(arg: ts.Expression): VerifyCompletionsCmd | un
286362 case "triggerCharacter" :
287363 case "defaultCommitCharacters" :
288364 break ; // !!! parse once they're supported in fourslash
289- case "optionalReplacementSpan" :
365+ case "optionalReplacementSpan" : // the only two tests that use this will require manual conversion
290366 case "isGlobalCompletion" :
291367 break ; // Ignored, unused
292368 default :
@@ -303,6 +379,9 @@ function parseVerifyCompletionArg(arg: ts.Expression): VerifyCompletionsCmd | un
303379}
304380
305381function parseExpectedCompletionItem ( expr : ts . Expression ) : string | undefined {
382+ if ( completionConstants . has ( expr . getText ( ) ) ) {
383+ return completionConstants . get ( expr . getText ( ) ) ! ;
384+ }
306385 if ( ts . isStringLiteral ( expr ) ) {
307386 return getGoStringLiteral ( expr . text ) ;
308387 }
@@ -501,16 +580,16 @@ function parseSortText(expr: ts.Expression): string | undefined {
501580 return "ls.SortTextOptionalMember" ;
502581 case "completion.SortText.MemberDeclaredBySpreadAssignment" :
503582 return "ls.SortTextMemberDeclaredBySpreadAssignment" ;
504- case "completion.SortText.SuggestedClassMember " :
505- return "ls.SortTextSuggestedClassMember " ;
583+ case "completion.SortText.SuggestedClassMembers " :
584+ return "ls.SortTextSuggestedClassMembers " ;
506585 case "completion.SortText.GlobalsOrKeywords" :
507586 return "ls.SortTextGlobalsOrKeywords" ;
508587 case "completion.SortText.AutoImportSuggestions" :
509588 return "ls.SortTextAutoImportSuggestions" ;
510589 case "completion.SortText.ClassMemberSnippets" :
511590 return "ls.SortTextClassMemberSnippets" ;
512- case "completion.SortText.JavaScriptIdentifiers " :
513- return "ls.SortTextJavaScriptIdentifiers " ;
591+ case "completion.SortText.JavascriptIdentifiers " :
592+ return "ls.SortTextJavascriptIdentifiers " ;
514593 default :
515594 console . error ( `Unrecognized sort text: ${ text } ) ;
516595 return undefined ; // !!! support deprecated/obj literal prop/etc
@@ -545,14 +624,14 @@ function generateVerifyCompletions({ marker, args, isNewIdentifierLocation }: Ve
545624 if ( args . excludes ) expected . push ( `Excludes: ${ args . excludes } ) ;
546625 if ( args . exact ) expected . push ( `Exact: ${ args . exact } ) ;
547626 // !!! isIncomplete
548- // !!! itemDefaults/commitCharacters from `isNewIdentifierLocation`
549627 const commitCharacters = isNewIdentifierLocation ? "[]string{}" : "defaultCommitCharacters" ;
550- expectedList = `&fourslash.VerifyCompletionsExpectedList {
628+ expectedList = `&fourslash.CompletionsExpectedList {
551629 IsIncomplete: false,
552- ItemDefaults: &lsproto.CompletionItemDefaults {
630+ ItemDefaults: &fourslash.CompletionsExpectedItemDefaults {
553631 CommitCharacters: &${ commitCharacters }
632+ EditRange: ignored,
554633 },
555- Items: &fourslash.VerifyCompletionsExpectedItems {
634+ Items: &fourslash.CompletionsExpectedItems {
556635 ${ expected . join ( "\n" ) }
557636 },
558637}` ;
@@ -614,14 +693,7 @@ func Test${testName}(t *testing.T) {
614693}
615694
616695function generateHelperFile ( ) {
617- const helper = `package fourslash_test
618-
619- func ptrTo[T any](v T) *T {
620- return &v
621- }
622-
623- var defaultCommitCharacters = []string{".", ",", ";"}` ;
624- fs . writeFileSync ( path . join ( outputDir , "util_test.go" ) , helper , "utf-8" ) ;
696+ fs . copyFileSync ( helperFilePath , path . join ( outputDir , "util_test.go" ) ) ;
625697}
626698
627699main ( ) ;
0 commit comments