Skip to content

Commit 22af925

Browse files
AnthonyLeonardoGracioAnthonyLeonardoGracio
committed
Merge branch 'topic/#1615' into 'master'
Use <HAS> macro to make test more robust to new GPR attributes Closes #1615 See merge request eng/ide/ada_language_server!1961
2 parents e7b48f2 + 9b20eae commit 22af925

File tree

1 file changed

+2
-220
lines changed
  • testsuite/gpr_lsp/completion_references

1 file changed

+2
-220
lines changed

‎testsuite/gpr_lsp/completion_references/test.json‎

Lines changed: 2 additions & 220 deletions
Original file line numberDiff line numberDiff line change
@@ -295,166 +295,11 @@
295295
"result": {
296296
"isIncomplete": false,
297297
"items": [
298+
"<HAS>",
298299
{
299300
"label": "Archive_Builder",
300301
"data": ["", "Archive_Builder"]
301302
},
302-
{
303-
"label": "Archive_Builder_Append_Option",
304-
"data": ["", "Archive_Builder_Append_Option"]
305-
},
306-
{
307-
"label": "Archive_Indexer",
308-
"data": ["", "Archive_Indexer"]
309-
},
310-
{
311-
"label": "Archive_Suffix",
312-
"data": ["", "Archive_Suffix"]
313-
},
314-
{
315-
"label": "Canonical_Target",
316-
"data": ["", "Canonical_Target"]
317-
},
318-
{
319-
"label": "Create_Missing_Dirs",
320-
"data": ["", "Create_Missing_Dirs"]
321-
},
322-
{
323-
"label": "Config_Prj_File",
324-
"data": ["", "Config_Prj_File"]
325-
},
326-
{
327-
"label": "Default_Language",
328-
"data": ["", "Default_Language"]
329-
},
330-
{
331-
"label": "Excluded_Source_Files",
332-
"data": ["", "Excluded_Source_Files"]
333-
},
334-
{
335-
"label": "Excluded_Source_Dirs",
336-
"data": ["", "Excluded_Source_Dirs"]
337-
},
338-
{
339-
"label": "Excluded_Source_List_File",
340-
"data": ["", "Excluded_Source_List_File"]
341-
},
342-
{
343-
"label": "Exec_Dir",
344-
"data": ["", "Exec_Dir"]
345-
},
346-
{
347-
"label": "Externally_Built",
348-
"data": ["", "Externally_Built"]
349-
},
350-
{
351-
"label": "Ignore_Source_Sub_Dirs",
352-
"data": ["", "Ignore_Source_Sub_Dirs"]
353-
},
354-
{
355-
"label": "Inherit_Source_Path",
356-
"data": ["", "Inherit_Source_Path"]
357-
},
358-
{
359-
"label": "Interfaces",
360-
"data": ["", "Interfaces"]
361-
},
362-
{
363-
"label": "Languages",
364-
"data": ["", "Languages"]
365-
},
366-
{
367-
"label": "Leading_Library_Options",
368-
"data": ["", "Leading_Library_Options"]
369-
},
370-
{
371-
"label": "Library_Auto_Init_Supported",
372-
"data": ["", "Library_Auto_Init_Supported"]
373-
},
374-
{
375-
"label": "Library_Builder",
376-
"data": ["", "Library_Builder"]
377-
},
378-
{
379-
"label": "Library_Encapsulated_Options",
380-
"data": ["", "Library_Encapsulated_Options"]
381-
},
382-
{
383-
"label": "Library_Gcc",
384-
"data": ["", "Library_Gcc"]
385-
},
386-
{
387-
"label": "Library_Install_Name_Option",
388-
"data": ["", "Library_Install_Name_Option"]
389-
},
390-
{
391-
"label": "Library_Major_Minor_Id_Supported",
392-
"data": ["", "Library_Major_Minor_Id_Supported"]
393-
},
394-
{
395-
"label": "Library_Partial_Linker",
396-
"data": ["", "Library_Partial_Linker"]
397-
},
398-
{
399-
"label": "Library_Reference_Symbol_File",
400-
"data": ["", "Library_Reference_Symbol_File"]
401-
},
402-
{
403-
"label": "Library_Rpath_Options",
404-
"data": ["", "Library_Rpath_Options"]
405-
},
406-
{
407-
"label": "Library_Support",
408-
"data": ["", "Library_Support"]
409-
},
410-
{
411-
"label": "Library_Version_Switches",
412-
"data": ["", "Library_Version_Switches"]
413-
},
414-
{
415-
"label": "Locally_Removed_Files",
416-
"data": ["", "Locally_Removed_Files"]
417-
},
418-
{
419-
"label": "Main",
420-
"data": ["", "Main"]
421-
},
422-
{
423-
"label": "Name",
424-
"data": ["", "Name"]
425-
},
426-
{
427-
"label": "Object_Dir",
428-
"data": ["", "Object_Dir"]
429-
},
430-
{
431-
"label": "Object_Generated",
432-
"data": ["", "Object_Generated"]
433-
},
434-
{
435-
"label": "Objects_Linked",
436-
"data": ["", "Objects_Linked"]
437-
},
438-
{
439-
"label": "Object_Lister",
440-
"data": ["", "Object_Lister"]
441-
},
442-
{
443-
"label": "Object_Lister_Matcher",
444-
"data": ["", "Object_Lister_Matcher"]
445-
},
446-
{
447-
"label": "Origin_Project",
448-
"data": ["", "Origin_Project"]
449-
},
450-
{
451-
"label": "Only_Dirs_With_Sources",
452-
"data": ["", "Only_Dirs_With_Sources"]
453-
},
454-
{
455-
"label": "Project_Dir",
456-
"data": ["", "Project_Dir"]
457-
},
458303
{
459304
"label": "Required_Toolchain_Version",
460305
"data": ["", "Required_Toolchain_Version"]
@@ -479,73 +324,10 @@
479324
"label": "Runtime_Dir",
480325
"data": ["", "Runtime_Dir"]
481326
},
482-
{
483-
"label": "Runtime_Library_Dir",
484-
"data": ["", "Runtime_Library_Dir"]
485-
},
486-
{
487-
"label": "Runtime_Source_Dir",
488-
"data": ["", "Runtime_Source_Dir"]
489-
},
490-
{
491-
"label": "Runtime_Source_Dirs",
492-
"data": ["", "Runtime_Source_Dirs"]
493-
},
494-
{
495-
"label": "Separate_Run_Path_Options",
496-
"data": ["", "Separate_Run_Path_Options"]
497-
},
498-
{
499-
"label": "Shared_Library_Minimum_Switches",
500-
"data": ["", "Shared_Library_Minimum_Switches"]
501-
},
502-
{
503-
"label": "Shared_Library_Prefix",
504-
"data": ["", "Shared_Library_Prefix"]
505-
},
506-
{
507-
"label": "Shared_Library_Suffix",
508-
"data": ["", "Shared_Library_Suffix"]
509-
},
510-
{
511-
"label": "Source_Dirs",
512-
"data": ["", "Source_Dirs"]
513-
},
514-
{
515-
"label": "Source_Files",
516-
"data": ["", "Source_Files"]
517-
},
518-
{
519-
"label": "Source_List_File",
520-
"data": ["", "Source_List_File"]
521-
},
522-
{
523-
"label": "Symbolic_Link_Supported",
524-
"data": ["", "Symbolic_Link_Supported"]
525-
},
327+
526328
{
527329
"label": "Target",
528330
"data": ["", "Target"]
529-
},
530-
{
531-
"label": "Toolchain_Version",
532-
"data": ["", "Toolchain_Version"]
533-
},
534-
{
535-
"label": "Toolchain_Name",
536-
"data": ["", "Toolchain_Name"]
537-
},
538-
{
539-
"label": "Toolchain_Description",
540-
"data": ["", "Toolchain_Description"]
541-
},
542-
{
543-
"label": "Toolchain_Path",
544-
"data": ["", "Toolchain_Path"]
545-
},
546-
{
547-
"label": "Warning_Message",
548-
"data": ["", "Warning_Message"]
549331
}
550332
]
551333
}

0 commit comments

Comments
 (0)