LSP for CodeCompass

plugins/cpp/service/include/service/cppservice.h

@@ -19,6 +19,7 @@
 #include <model/cpprelation-odb.hxx>
 
 #include <util/odbtransaction.h>
+#include "util/graph.h"
 #include <webserver/servercontext.h>
 
 namespace cc
@@ -69,6 +70,10 @@ class CppServiceHandler : virtual public LanguageServiceIf
  const core::AstNodeId& astNodeId_,
  const std::int32_t diagramId_) override;
 
+ util::Graph returnDiagram(
+ const core::AstNodeId& astNodeId_,
+ const std::int32_t diagramId_);
+
  void getDiagramLegend(
  std::string& return_,
  const std::int32_t diagramId_) override;
@@ -82,6 +87,10 @@ class CppServiceHandler : virtual public LanguageServiceIf
  const core::FileId& fileId_,
  const int32_t diagramId_) override;
 
+ util::Graph returnFileDiagram(
+ const core::FileId& fileId_,
+ const int32_t diagramId_);
+
  void getFileDiagramLegend(
  std::string& return_,
  const std::int32_t diagramId_) override;
@@ -131,7 +140,6 @@ class CppServiceHandler : virtual public LanguageServiceIf
  std::vector<SyntaxHighlight>& return_,
  const core::FileRange& range_) override;
 
-private:
  enum ReferenceType
  {
  DEFINITION, /*!< By this option the definition(s) of the AST node can be
@@ -258,6 +266,7 @@ class CppServiceHandler : virtual public LanguageServiceIf
  of a module. */
  };
 
+private:
  static bool compareByPosition(
  const model::CppAstNode& lhs,
  const model::CppAstNode& rhs);

plugins/cpp/service/src/cppservice.cpp

@@ -280,7 +280,7 @@ void CppServiceHandler::getProperties(
  {
  VarResult variables = _db->query<model::CppVariable>(
  VarQuery::entityHash == node.entityHash);
- 
+
  if (!variables.empty())
  {
  model::CppVariable variable = *variables.begin();
@@ -289,7 +289,7 @@ void CppServiceHandler::getProperties(
  return_["Type"] = variable.qualifiedType;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying properties "
  "of C++ variable: "
  << toShortDiagnosticString(node);
@@ -312,7 +312,7 @@ void CppServiceHandler::getProperties(
  return_["Signature"] = function.name;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying properties "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -338,7 +338,7 @@ void CppServiceHandler::getProperties(
  return_["Qualified name"] = type.qualifiedName;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying properties "
  "of C++ type: "
  << toShortDiagnosticString(node);
@@ -359,11 +359,11 @@ void CppServiceHandler::getProperties(
  return_["Qualified name"] = type.qualifiedName;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying properties "
  "of C++ typedef: "
  << toShortDiagnosticString(node);
- 
+
  break;
  }
 
@@ -381,7 +381,7 @@ void CppServiceHandler::getProperties(
  return_["Value"] = std::to_string(enumConst.value);
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying properties "
  "of C++ enum constant: "
  << toShortDiagnosticString(node);
@@ -502,7 +502,7 @@ std::int32_t CppServiceHandler::getReferenceCount(
  TypeQuery::entityHash == function.typeHash).count;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when counting return types "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -538,7 +538,7 @@ std::int32_t CppServiceHandler::getReferenceCount(
  TypeQuery::entityHash == variable.typeHash).count;
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when counting types "
  "of C++ variable: "
  << toShortDiagnosticString(node);
@@ -788,7 +788,7 @@ void CppServiceHandler::getReferences(
  std::to_string(var.load()->astNodeId)));
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying parameters "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -811,7 +811,7 @@ void CppServiceHandler::getReferences(
  std::to_string(var.load()->astNodeId)));
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying local variables "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -840,7 +840,7 @@ void CppServiceHandler::getReferences(
  }
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying return type "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -904,7 +904,7 @@ void CppServiceHandler::getReferences(
  }
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying type "
  "of C++ variable: "
  << toShortDiagnosticString(node);
@@ -1005,7 +1005,7 @@ void CppServiceHandler::getReferences(
  nodes = std::vector<model::CppAstNode>(result.begin(), result.end());
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying underlying type "
  "of C++ typedef: "
  << toShortDiagnosticString(node);
@@ -1033,7 +1033,7 @@ void CppServiceHandler::getReferences(
  });
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying enum constants "
  "of C++ enum: "
  << toShortDiagnosticString(node);
@@ -1253,7 +1253,9 @@ void CppServiceHandler::getSyntaxHighlight(
 
  // Regular expression to find element position
  const std::regex specialChars { R"([-[\]{}()*+?.,\^$|#\s])" };
- std::string sanitizedAstValue = std::regex_replace(node.astValue, specialChars, R"(\$&)");
+ std::string sanitizedAstValue = std::regex_replace(node.astValue,
+ specialChars,
+ R"(\$&)");
  std::string reg = "\\b" + sanitizedAstValue + "\\b";
 
  for (std::size_t i = node.location.range.start.line - 1;
@@ -1291,6 +1293,16 @@ void CppServiceHandler::getDiagram(
  std::string& return_,
  const core::AstNodeId& astNodeId_,
  const std::int32_t diagramId_)
+{
+ util::Graph graph = returnDiagram(astNodeId_, diagramId_);
+
+ if (graph.nodeCount() != 0)
+ return_ = graph.output(util::Graph::SVG);
+}
+
+util::Graph CppServiceHandler::returnDiagram(
+ const core::AstNodeId& astNodeId_,
+ const std::int32_t diagramId_)
 {
  Diagram diagram(_db, _datadir, _context);
  util::Graph graph;
@@ -1310,8 +1322,7 @@ void CppServiceHandler::getDiagram(
  break;
  }
 
- if (graph.nodeCount() != 0)
- return_ = graph.output(util::Graph::SVG);
+ return graph;
 }
 
 void CppServiceHandler::getDiagramLegend(
@@ -1366,6 +1377,16 @@ void CppServiceHandler::getFileDiagram(
  std::string& return_,
  const core::FileId& fileId_,
  const int32_t diagramId_)
+{
+ util::Graph graph = returnFileDiagram(fileId_, diagramId_);
+
+ if (graph.nodeCount() != 0)
+ return_ = graph.output(util::Graph::SVG);
+}
+
+util::Graph CppServiceHandler::returnFileDiagram(
+ const core::FileId& fileId_,
+ const int32_t diagramId_)
 {
  FileDiagram diagram(_db, _datadir, _context);
  util::Graph graph;
@@ -1398,8 +1419,7 @@ void CppServiceHandler::getFileDiagram(
  break;
  }
 
- if (graph.nodeCount() != 0)
- return_ = graph.output(util::Graph::SVG);
+ return graph;
 }
 
 void CppServiceHandler::getFileDiagramLegend(
@@ -1649,7 +1669,7 @@ CppServiceHandler::getTags(const std::vector<model::CppAstNode>& nodes_)
  tags[node.id].push_back(model::tagToString(tag));
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying tags "
  "of C++ function: "
  << toShortDiagnosticString(node);
@@ -1684,7 +1704,7 @@ CppServiceHandler::getTags(const std::vector<model::CppAstNode>& nodes_)
  tags[node.id].push_back(model::tagToString(tag));
  }
  else
- LOG(warning) 
+ LOG(warning)
  << "Unexpected empty result when querying tags "
  "of C++ variable: "
  << toShortDiagnosticString(node);

plugins/cpp/service/src/diagram.cpp

@@ -1,3 +1,5 @@
+#include <sstream>
+
 #include <model/cppvariable.h>
 #include <model/cppvariable-odb.hxx>
 #include <model/cpprecord.h>

plugins/cpp/service/src/filediagram.cpp

@@ -107,7 +107,7 @@ void FileDiagram::getIncludeDependencyDiagram(
  util::bfsBuild(graph_, currentNode,std::bind(&FileDiagram::getRevUsages,
  this, std::placeholders::_1, std::placeholders::_2),
  {}, revUsagesEdgeDecoration, 3);
- 
+
  util::bfsBuild(graph_, currentNode, std::bind(&FileDiagram::getProvides,
  this, std::placeholders::_1, std::placeholders::_2),
  {}, usagesEdgeDecoration, 3);

plugins/cpp_lsp/CMakeLists.txt

@@ -0,0 +1,11 @@
+# The C++ lsp plugin depends on the C++ plugin's components to be built.
+
+if ("${cpp_PLUGIN_DIR}" STREQUAL "")
+ # Use SEND_ERROR here so a build file is not generated at the end.
+ # CodeCompass might use a lot of plugins and produce a lengthy build, so
+ # a warning at configure time would easily be missed by the users.
+ message(SEND_ERROR
+ "C++ LSP plugin found without C++ plugin in the plugins directory.")
+endif()
+
+add_subdirectory(service)

plugins/cpp_lsp/service/CMakeLists.txt

@@ -0,0 +1,24 @@
+include_directories(
+ include
+ ${PROJECT_SOURCE_DIR}/model/include
+ ${PROJECT_BINARY_DIR}/service/language/gen-cpp
+ ${PROJECT_BINARY_DIR}/service/project/gen-cpp
+ ${PROJECT_SOURCE_DIR}/service/project/include
+ ${PROJECT_SOURCE_DIR}/plugins/cpp/service/include
+ ${PROJECT_SOURCE_DIR}/plugins/cpp/model/include
+ ${CMAKE_BINARY_DIR}/model/include
+ ${CMAKE_BINARY_DIR}/plugins/cpp/model/include
+ ${PROJECT_SOURCE_DIR}/util/include
+ ${PROJECT_SOURCE_DIR}/webserver/include
+ ${PROJECT_SOURCE_DIR}/service/lsp/include)
+
+add_library(cpplspservice SHARED
+ src/cpplspservice.cpp
+ src/plugin.cpp)
+
+target_link_libraries(cpplspservice
+ cppservice
+ lspservice
+ util)
+
+install(TARGETS cpplspservice DESTINATION ${INSTALL_SERVICE_DIR})