Merge pull request #2084 from hzeller/20240129-rename-lsp

Rename verilog_ls.cc to the actual name the binary has.

Author: hzeller

verilog/tools/ls/BUILD

@@ -124,7 +124,10 @@ cc_library(
         ":lsp-parse-buffer",
         "//common/lsp:lsp-file-utils",
         "//common/lsp:lsp-protocol",
+        "//common/lsp:lsp-text-buffer",
         "//common/strings:line-column-map",
+        "//common/text:text-structure",
+        "//common/text:token-info",
         "//common/util:file-util",
         "//common/util:iterator-adaptors",
         "//common/util:logging",
@@ -148,6 +151,7 @@ cc_test(
     srcs = ["symbol-table-handler_test.cc"],
     deps = [
         ":symbol-table-handler",
+        "//common/lsp:lsp-file-utils",
         "//common/util:file-util",
         "//verilog/analysis:verilog-project",
         "@com_google_absl//absl/strings",
@@ -194,12 +198,14 @@ cc_test(
 
 cc_binary(
     name = "verible-verilog-ls",
-    srcs = ["verilog_ls.cc"],
+    srcs = ["verible-verilog-ls.cc"],
     features = STATIC_EXECUTABLES_FEATURE,
     visibility = ["//visibility:public"],
     deps = [
         ":verilog-language-server",
         "//common/util:init-command-line",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
     ],
 )
 

verilog/tools/ls/symbol-table-handler.cc

@@ -15,6 +15,7 @@
 
 #include "verilog/tools/ls/symbol-table-handler.h"
 
+#include <algorithm>
 #include <filesystem>
 #include <map>
 #include <memory>
@@ -29,13 +30,17 @@
 #include "absl/time/time.h"
 #include "common/lsp/lsp-file-utils.h"
 #include "common/lsp/lsp-protocol.h"
+#include "common/lsp/lsp-text-buffer.h"
 #include "common/strings/line_column_map.h"
+#include "common/text/text_structure.h"
+#include "common/text/token_info.h"
 #include "common/util/file_util.h"
 #include "common/util/iterator_adaptors.h"
 #include "common/util/logging.h"
 #include "common/util/range.h"
 #include "verilog/analysis/verilog_filelist.h"
 #include "verilog/tools/ls/lsp-conversion.h"
+#include "verilog/tools/ls/lsp-parse-buffer.h"
 
 ABSL_FLAG(std::string, file_list_path, "verible.filelist",
           "Name of the file with Verible FileList for the project");
@@ -473,7 +478,6 @@ SymbolTableHandler::FindRenameLocationsAndCreateEdits(
       .changes = {},
   };
   edit.changes = file_edit_pairs;
-  std::cerr << "SIZE: " << edit.changes[locations[0].uri].size() << std::endl;
   return edit;
 }
 void SymbolTableHandler::CollectReferencesReferenceComponents(

verilog/tools/ls/verilog_ls.cc verilog/tools/ls/verible-verilog-ls.cc

@@ -13,9 +13,10 @@
 // limitations under the License.
 //
 
-#include <functional>
 #include <iostream>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "common/util/init_command_line.h"
 #include "verilog/tools/ls/verilog-language-server.h"
 
@@ -57,7 +58,7 @@ int main(int argc, char *argv[]) {
     return read(kInputFD, buf, size);
   });
 
-  std::cerr << status.message() << std::endl;
+  std::cerr << status << '\n';
 
   server.PrintStatistics();
 }