fix: Normalize B4G program names

eclipse-che4z · Jul 12, 2023 · db46aa7 · db46aa7
1 parent f0536df
commit db46aa7
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 116 deletions.
diff --git a/clients/vscode-hlasmplugin/CHANGELOG.md b/clients/vscode-hlasmplugin/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Incorrect processing of self-referencing data definition statements
 - Enhanced multiline support in TextMate grammar for source files
 - Better handling of Unicode Supplementary Planes
+- Incorrect processor group could be assigned to programs stated in `.bridge.json`
 
 ## [1.8.0](https://github.com/eclipse-che4z/che-che4z-lsp-for-hlasm/compare/1.7.0...1.8.0) (2023-05-24)
 

diff --git a/cmake/uri_patch.diff b/cmake/uri_patch.diff
@@ -1,3 +1,18 @@
+diff --git a/include/network/string_view.hpp b/include/network/string_view.hpp
+index 8ff7a5e..a482a51 100644
+--- a/include/network/string_view.hpp
++++ b/include/network/string_view.hpp
+@@ -164,8 +164,8 @@ class basic_string_view {
+                ? traits::compare(data(), s.data(), size())
+                : (size() < s.size()
+                       ? (traits::compare(data(), s.data(), size()) > 0 ? 1 : -1)
+-                      : (traits::compare(data(), s.data(), size()) < 0 ? -1
+-                                                                       : 1));
++                      : (traits::compare(data(), s.data(), s.size()) < 0 ? -1
++                                                                         : 1));
+   }
+
+   constexpr int compare(size_type pos1, size_type n1,
 diff --git a/src/detail/uri_parse.cpp b/src/detail/uri_parse.cpp
 index 7f77148..73f581e 100644
 --- a/src/detail/uri_parse.cpp

diff --git a/parser_library/src/workspaces/workspace_configuration.cpp b/parser_library/src/workspaces/workspace_configuration.cpp
@@ -411,7 +411,7 @@ bool workspace_configuration::is_config_file(const utils::resource::resource_loc
 
 bool workspace_configuration::is_b4g_config_file(const utils::resource::resource_location& file) const
 {
-    return file.get_uri().ends_with(B4G_CONF_FILE) && utils::resource::filename(file) == B4G_CONF_FILE;
+    return file.filename() == B4G_CONF_FILE;
 }
 
 // open config files and parse them
@@ -576,7 +576,7 @@ workspace_configuration::try_creating_rl_tagged_pgm_pair(
     }
 
     auto rl = default_b4g_proc_group ? utils::resource::resource_location::join(file_root, "*")
-                                     : utils::resource::resource_location::join(file_root, filename);
+                                     : utils::resource::resource_location::join(file_root, filename).lexically_normal();
 
     return std::make_pair(std::move(rl),
         tagged_program {