better support for goto definition

Author: drblallo

lib/dialect/src/Interfaces.td

@@ -66,6 +66,27 @@ def TypeDeclarer : RLC_Interface<"TypeDeclarer"> {
 ];
 }
 
+def DefinitionUser : RLC_Interface<"DefinitionUser"> {
+    let description = [{
+        A element of the AST where the user refers to some other element.
+        example
+        some_function(x, y, z) refers to some_function, x, y, and z
+    }];
+
+    let methods = [
+        InterfaceMethod<
+            "the used operations",
+            "llvm::SmallVector<mlir::Operation*, 2>", "getUsedOperations",
+            (ins)
+        >,
+        InterfaceMethod<
+            "the used operations",
+            "llvm::SmallVector<mlir::Type, 2>", "getUsedTypes",
+            (ins)
+        >,
+];
+}
+
 def TypeUser : RLC_Interface<"TypeUser"> {
     let description = [{
         A element of the AST where the user has written a type, or more than one for example in class declarations.

lib/dialect/src/Operations.cpp

@@ -3471,3 +3471,35 @@ mlir::ArrayAttr mlir::rlc::ExplicitConstructOp::getResAttrsAttr()
 {
 	return mlir::ArrayAttr::get(getContext(), {});
 }
+
+llvm::SmallVector<mlir::Type, 2> mlir::rlc::MemberAccess::getUsedTypes()
+{
+	llvm::SmallVector<mlir::Type, 2> toReturn;
+	if (auto casted = mlir::dyn_cast<mlir::rlc::ClassType>(getValue().getType()))
+	{
+		toReturn.push_back(casted);
+	}
+	return toReturn;
+}
+
+llvm::SmallVector<mlir::Operation *, 2>
+mlir::rlc::MemberAccess::getUsedOperations()
+{
+	return {};
+}
+
+llvm::SmallVector<mlir::Type, 2> mlir::rlc::CallOp::getUsedTypes()
+{
+	return {};
+}
+
+llvm::SmallVector<mlir::Operation *, 2> mlir::rlc::CallOp::getUsedOperations()
+{
+	llvm::SmallVector<mlir::Operation *, 2> toReturn;
+	if (auto casted = mlir::dyn_cast_or_null<mlir::rlc::TemplateInstantiationOp>(
+					getCallee().getDefiningOp()))
+		toReturn.push_back(casted.getInputTemplate().getDefiningOp());
+	else
+		toReturn.push_back(getCallee().getDefiningOp());
+	return toReturn;
+}

lib/dialect/src/Operations.td

@@ -1155,9 +1155,11 @@ def RLC_CallOp : RLC_Dialect<"call",
     [CallOpInterface,
     DeclareOpInterfaceMethods<SymbolUserOpInterface>,
 	DeclareOpInterfaceMethods<TypeCheckable>,
-    DeclareOpInterfaceMethods<Serializable>
+    DeclareOpInterfaceMethods<Serializable>,
+    DeclareOpInterfaceMethods<DefinitionUser>
     ]>
 {
+
     let summary = "Call operation.";
 
     let arguments = (ins AnyFunctionType:$callee, BoolAttr:$is_member_call, Variadic<AnyType>:$args);
@@ -1340,7 +1342,7 @@ def RLC_Constant : RLC_Dialect<"constant", [DeclareOpInterfaceMethods<TypeChecka
 
 
 
-def RLC_MemberAccess : RLC_Dialect<"member_access", [DeclareOpInterfaceMethods<TypeCheckable>, DeclareOpInterfaceMethods<Serializable>]> {
+def RLC_MemberAccess : RLC_Dialect<"member_access", [DeclareOpInterfaceMethods<TypeCheckable>, DeclareOpInterfaceMethods<Serializable>, DeclareOpInterfaceMethods<DefinitionUser>]> {
   let summary = "constant.";
 
   let description = [{

lib/lsp/src/LSP.cpp

@@ -102,6 +102,7 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 	explicit LSPModuleInfoImpl(
 			llvm::StringRef path, llvm::StringRef contents, LSPContext &lspContext)
 			: context(mlir::MLIRContext::Threading::DISABLED),
+				path(path.str()),
 				diagnosticHandler(
 						&context,
 						[this](mlir::Diagnostic &diagnostic) {
@@ -651,34 +652,81 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 		return mlir::success();
 	}
 
+	template<template<class> class trait>
+	mlir::Operation *getNearestOpWithTrait(const mlir::lsp::Position &defPos)
+	{
+		mlir::Operation *nearest = nullptr;
+		int column = 0;
+		module.walk([&](mlir::Operation *op) {
+			if (not op->hasTrait<trait>())
+				return;
+			mlir::Location loc = op->getLoc();
+			if (loc == nullptr)
+				return;
+
+			auto pos = locToPos(loc);
+
+			if (defPos.line != pos.line)
+				return;
+
+			auto castedBegin = mlir::cast<mlir::FileLineColLoc>(loc);
+			if (path != castedBegin.getFilename())
+				return;
+
+			if (abs(defPos.character - pos.character) < abs(column - pos.character))
+			{
+				column = pos.character;
+				nearest = op;
+			}
+		});
+		return nearest;
+	}
+
+	mlir::Operation *findDeclarationOf(mlir::Type type)
+	{
+		if (auto casted = mlir::dyn_cast<mlir::rlc::ClassType>(type))
+			for (auto classDecl : module.getOps<mlir::rlc::ClassDeclaration>())
+			{
+				if (classDecl.getName() == casted.getName())
+					return classDecl;
+			}
+
+		return nullptr;
+	}
+
 	void getLocationsOf(
 			const mlir::lsp::Position &defPos,
 			std::vector<mlir::lsp::Location> &locations)
 	{
-		auto *nearestDecl = getOperation(defPos);
+		auto *nearestDecl =
+				getNearestOpWithTrait<mlir::rlc::DefinitionUser::Trait>(defPos);
 		if (nearestDecl == nullptr)
 			return;
 
-		auto casted = mlir::dyn_cast<mlir::rlc::CallOp>(nearestDecl);
+		auto casted = mlir::dyn_cast<mlir::rlc::DefinitionUser>(nearestDecl);
 		if (not casted)
 			return;
 
-		auto templateInst =
-				mlir::dyn_cast<mlir::rlc::TemplateInstantiationOp>(nearestDecl);
-		if (templateInst)
+		for (auto *op : casted.getUsedOperations())
 		{
-			auto maybeLoc = locToLoc(templateInst.getInputTemplate().getLoc());
+			auto maybeLoc = locToLoc(op->getLoc());
 			if (maybeLoc)
 				locations.push_back(*maybeLoc);
 			else
 				llvm::consumeError(maybeLoc.takeError());
-			return;
-		};
-		auto maybeLoc = locToLoc(casted.getCallee().getLoc());
-		if (maybeLoc)
-			locations.push_back(*maybeLoc);
-		else
-			llvm::consumeError(maybeLoc.takeError());
+		}
+
+		for (auto type : casted.getUsedTypes())
+		{
+			auto op = findDeclarationOf(type);
+			if (not op)
+				continue;
+			auto maybeLoc = locToLoc(op->getLoc());
+			if (maybeLoc)
+				locations.push_back(*maybeLoc);
+			else
+				llvm::consumeError(maybeLoc.takeError());
+		}
 	}
 
 	void findReferencesOf(
@@ -769,6 +817,7 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 	llvm::SmallVector<mlir::rlc::lsp::Diagnostic> diagnostics;
 	mlir::DialectRegistry Registry;
 	mlir::MLIRContext context;
+	std::string path;
 	mlir::ScopedDiagnosticHandler diagnosticHandler;
 	mlir::ModuleOp module;
 	std::string currentFileContent;

python/setup.py

@@ -99,7 +99,7 @@ def copy_binaries(source_directory, destination_directory):
     target_bin_dir if os.name != "nt" else os.path.join("Lib", "site-packages")
 )
 
-version="0.4.8"
+version="0.4.9"
 setup(
     name="rl_language_core",
     version=version,