Merge branch 'topic/gil-edge-automatic-merges-219' into 'edge'

fix merge conflict See merge request eng/ide/ada_language_server!1548
AdaCore · Apr 19, 2024 · 42aa322 · 42aa322
2 parents 2a83d24 + 45863f4
commit 42aa322
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 741 deletions.
diff --git a/testsuite/gpr_lsp/import_using_space_string/others/test.yaml b/testsuite/gpr_lsp/import_using_space_string/others/test.yaml
diff --git a/.../import_using_space_string/others/prj.gpr → ...gpr_lsp/import_using_space_string/prj.gpr b/.../import_using_space_string/others/prj.gpr → ...gpr_lsp/import_using_space_string/prj.gpr
diff --git a/...mport_using_space_string/others/test.json → ...r_lsp/import_using_space_string/test.json b/...mport_using_space_string/others/test.json → ...r_lsp/import_using_space_string/test.json
diff --git a/testsuite/gpr_lsp/import_using_space_string/test.yaml b/testsuite/gpr_lsp/import_using_space_string/test.yaml
@@ -0,0 +1 @@
+title: 'check with " "; support'
diff --git a/testsuite/gpr_lsp/import_using_space_string/windows/prj.gpr b/testsuite/gpr_lsp/import_using_space_string/windows/prj.gpr
diff --git a/testsuite/gpr_lsp/import_using_space_string/windows/test.json b/testsuite/gpr_lsp/import_using_space_string/windows/test.json
diff --git a/testsuite/gpr_lsp/import_using_space_string/windows/test.yaml b/testsuite/gpr_lsp/import_using_space_string/windows/test.yaml
diff --git a/testsuite/gpr_lsp/invalid_file_name_support/others/test.yaml b/testsuite/gpr_lsp/invalid_file_name_support/others/test.yaml
diff --git a/.../invalid_file_name_support/others/prj.gpr → ...gpr_lsp/invalid_file_name_support/prj.gpr b/.../invalid_file_name_support/others/prj.gpr → ...gpr_lsp/invalid_file_name_support/prj.gpr
diff --git a/...nvalid_file_name_support/others/test.json → ...r_lsp/invalid_file_name_support/test.json b/...nvalid_file_name_support/others/test.json → ...r_lsp/invalid_file_name_support/test.json
diff --git a/testsuite/gpr_lsp/invalid_file_name_support/test.yaml b/testsuite/gpr_lsp/invalid_file_name_support/test.yaml
@@ -0,0 +1,2 @@
+title: 'check invalid filename handling'
+
diff --git a/testsuite/gpr_lsp/invalid_file_name_support/windows/prj.gpr b/testsuite/gpr_lsp/invalid_file_name_support/windows/prj.gpr