Merge pull request #2 from thorulf4/fix_find_process

Fixed issue where template name would cause bad lookup

Author: thorulf4

include/uls/utap_extension.h

@@ -22,7 +22,7 @@ UTAP::declarations_t& navigate_xpath(UTAP::Document& doc, std::string_view path)
  */
 UTAP::declarations_t& navigate_xpath(UTAP::Document& doc, std::string_view path, uint32_t pos);
 
-UTAP::template_t& find_process(UTAP::Document& doc, std::string_view name);
+std::optional<std::reference_wrapper<UTAP::template_t>> find_process(UTAP::Document& doc, std::string_view name);
 
 /**
  * This class is used to iterate through symbols from a given declarations

src/autocomplete.cpp

@@ -233,10 +233,11 @@ void AutocompleteModule::configure(Server& server)
             if (std::optional<UtapEntity> entity = find_declaration(doc, decls, id.identifier.substr(0, offset))) {
                 results.set_prefix(id.identifier.substr(0, offset + 1));
                 std::visit(overloaded{[&](UTAP::symbol_t& sym) {
-                                          if (is_template(sym) && is_query)
-                                              results.add_template(find_process(doc, sym.get_name()));
-                                          else if (is_struct(sym))
-                                              results.add_struct(sym.get_type().get(0));
+                                        if (is_template(sym) && is_query){
+                                            if(auto process = find_process(doc, sym.get_name()))
+                                                results.add_template(*process);
+                                        } else if (is_struct(sym))
+                                            results.add_struct(sym.get_type().get(0));
                                       },
                                       [&](UTAP::type_t& type) { results.add_struct(type); }},
                            *entity);

src/declarations.cpp

@@ -96,9 +96,10 @@ std::optional<Sym> find_sym(UTAP::Document& doc, UTAP::declarations_t& decls, st
         if (struct_symbol.has_value()) {
             if (struct_symbol->type.is_constant())
                 finder.set_source(struct_symbol->type.get(0).get(0));
-            else if (struct_symbol->type.is(UTAP::Constants::INSTANCE))
-                finder.set_source(&find_process(doc, label));
-            else
+            else if (struct_symbol->type.is(UTAP::Constants::INSTANCE)){
+                if(auto opt_process = find_process(doc, label))
+                    finder.set_source(&static_cast<UTAP::template_t&>(*opt_process));
+            } else
                 finder.set_source(struct_symbol->type.get(0));
         } else {
             return std::nullopt;

src/utap_extension.cpp

@@ -58,15 +58,14 @@ UTAP::declarations_t& navigate_xpath(UTAP::Document& doc, std::string_view path,
     return decl;
 }
 
-UTAP::template_t& find_process(UTAP::Document& doc, std::string_view name)
+std::optional<std::reference_wrapper<UTAP::template_t>> find_process(UTAP::Document& doc, std::string_view name)
 {
     for (auto& process : doc.get_processes()) {
         if (process.uid.get_name() == name) {
             if (process.templ)
                 return *process.templ;
-            else
-                throw std::logic_error("Process did not have a template");
+            return std::nullopt;
         }
     }
-    throw std::logic_error("No such process");
+    return std::nullopt;
 }

test/test_autocomplete.cpp

@@ -365,4 +365,23 @@ TEST_CASE("Autocomplete template dont see locations")
     CHECK(unique_name_view(mock.receive()) == json{"xax", "point", "p_a", "func"});
     REQUIRE(mock.receive() == OK_RESPONSE);
     CHECK_EOF(mock);
+}
+
+TEST_CASE("Autocomplete fails when identifier matches template name"){
+    auto repo = SystemRepository{};
+    auto autocomplete = AutocompleteModule{repo};  // Use an empty set of builtin items
+
+    auto mock = MockIO{};
+    mock.send("upload", MODEL3);
+    mock.send("autocomplete", {{"xpath", "/nta/queries!"}, {"identifier", "Template."}, {"offset", 1}});
+    mock.send_cmd("exit");
+
+    auto server = Server{mock};
+    server.add_close_command("exit").add_module(repo).add_module(autocomplete).start();
+
+    REQUIRE(mock.handshake());
+    REQUIRE(mock.receive() == OK_RESPONSE);
+    CHECK(unique_name_view(mock.receive()) == json{});
+    REQUIRE(mock.receive() == OK_RESPONSE);
+    CHECK_EOF(mock);
 }