improved autocomplete

Author: drblallo

lib/lsp/include/rlc/lsp/LSP.hpp

@@ -63,6 +63,10 @@ namespace mlir::rlc::lsp
 				const mlir::lsp::Position &completePos,
 				mlir::lsp::CompletionList &list) const;
 
+		mlir::LogicalResult getCompleteEnum(
+				const mlir::lsp::Position &completePos,
+				mlir::lsp::CompletionList &list) const;
+
 		mlir::LogicalResult getCompleteFunction(
 				const mlir::lsp::Position &completePos,
 				mlir::lsp::CompletionList &list) const;

lib/lsp/src/LSP.cpp

@@ -38,7 +38,6 @@ static mlir::lsp::Position locToPos(mlir::Location location)
 static llvm::Expected<mlir::lsp::Location> locToLoc(mlir::Location location)
 {
 	auto castedBegin = location.cast<mlir::FileLineColLoc>();
-	llvm::errs() << castedBegin.getFilename().str();
 	auto uri = mlir::lsp::URIForFile::fromFile(castedBegin.getFilename().str());
 	if (not uri)
 	{
@@ -52,6 +51,10 @@ static llvm::Expected<mlir::lsp::Location> locToLoc(mlir::Location location)
 static mlir::lsp::Range locsToRange(mlir::Location begin, mlir::Location end)
 {
 	auto toReturn = mlir::lsp::Range(locToPos(begin), locToPos(end));
+	// if the range goes backward, say that it is a one character wide range
+	// starting from the known start
+	if (toReturn.end.character < toReturn.start.character)
+		toReturn.end.character = toReturn.start.character + 1;
 	return toReturn;
 }
 
@@ -167,6 +170,15 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 			declarations.emplace_back(
 					locsToRange(loc, firstInstructionLoc), decl.getOperation());
 		});
+		module.walk([this](mlir::rlc::UncheckedEnumUse enumUse) {
+			if (enumUse->getNextNode() == nullptr)
+				return;
+			auto firstInstructionLoc =
+					enumUse->getNextNode()->getLoc().cast<mlir::FileLineColLoc>();
+			auto loc = enumUse.getLoc().cast<mlir::FileLineColLoc>();
+			enumUses.emplace_back(locsToRange(loc, firstInstructionLoc), enumUse);
+			enumUses.back().first.end.character++;
+		});
 		module.walk([this](mlir::rlc::CallOp decl) {
 			if (decl->getNextNode() == nullptr)
 				return;
@@ -214,6 +226,17 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 		return nullptr;
 	}
 
+	mlir::rlc::UncheckedEnumUse getNearestEnumUse(const mlir::lsp::Position &pos)
+	{
+		for (const auto &pair :
+				 llvm::make_range(enumUses.rbegin(), enumUses.rend()))
+		{
+			if (pair.first.contains(pos) and opIsInSameFile(pair.second))
+				return pair.second;
+		}
+		return nullptr;
+	}
+
 	mlir::Operation *getNearestMemberAccess(const mlir::lsp::Position &pos)
 	{
 		for (const auto &pair :
@@ -509,6 +532,35 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 		return mlir::success();
 	}
 
+	mlir::LogicalResult getCompleteEnum(
+			const mlir::lsp::Position &completePos, mlir::lsp::CompletionList &list)
+	{
+		auto enumUse = getNearestEnumUse(completePos);
+		if (enumUse == nullptr)
+		{
+			return mlir::failure();
+		}
+
+		for (auto enumDecl : module.getOps<mlir::rlc::EnumDeclarationOp>())
+		{
+			if (enumDecl.getName() != enumUse.getEnumName())
+				continue;
+
+			using KeyType = std::pair<std::string, const void *>;
+			std::set<KeyType> alreadyEmitted;
+			for (auto field :
+					 enumDecl.getBody().getOps<mlir::rlc::EnumFieldDeclarationOp>())
+			{
+				mlir::lsp::CompletionItem item;
+				item.label = field.getName();
+				item.kind = mlir::lsp::CompletionItemKind::Function;
+				item.insertTextFormat = mlir::lsp::InsertTextFormat::PlainText;
+				list.items.push_back(item);
+			}
+		}
+		return mlir::success();
+	}
+
 	mlir::LogicalResult getCompleteAccessMember(
 			const mlir::lsp::Position &completePos, mlir::lsp::CompletionList &list)
 	{
@@ -707,6 +759,9 @@ class mlir::rlc::lsp::LSPModuleInfoImpl
 	llvm::SmallVector<std::pair<mlir::lsp::Range, mlir::Operation *>>
 			functionAndActionFunctions;
 
+	llvm::SmallVector<std::pair<mlir::lsp::Range, mlir::rlc::UncheckedEnumUse>>
+			enumUses;
+
 	llvm::SmallVector<mlir::rlc::lsp::Diagnostic> diagnostics;
 	mlir::DialectRegistry Registry;
 	mlir::MLIRContext context;
@@ -744,6 +799,13 @@ mlir::LogicalResult LSPModuleInfo::getCompleteAccessMember(
 	return impl->getCompleteAccessMember(completePos, list);
 }
 
+mlir::LogicalResult LSPModuleInfo::getCompleteEnum(
+		const mlir::lsp::Position &completePos,
+		mlir::lsp::CompletionList &list) const
+{
+	return impl->getCompleteEnum(completePos, list);
+}
+
 mlir::LogicalResult LSPModuleInfo::getCompleteType(
 		const mlir::lsp::Position &completePos,
 		mlir::lsp::CompletionList &list) const
@@ -916,6 +978,11 @@ mlir::lsp::CompletionList RLCServer::getCodeCompletion(
 		return list;
 	}
 
+	if (maybeInfo->getCompleteEnum(completePos, list).succeeded())
+	{
+		return list;
+	}
+
 	if (maybeInfo->getCompleteAccessMember(completePos, list).succeeded())
 	{
 		return list;

lib/parser/src/Parser.cpp

@@ -276,13 +276,20 @@ Expected<mlir::Value> Parser::primaryExpression()
 			return builder.create<mlir::rlc::UnresolvedReference>(location, lIdent);
 
 		auto enumName = lIdent;
-		EXPECT(Token::Identifier);
-		auto enumField = lIdent;
-		return builder.create<mlir::rlc::UncheckedEnumUse>(
+		std::string enumField = "";
+		if (accept(Token::Identifier))
+		{
+			enumField = lIdent;
+		}
+
+		auto toReturn = builder.create<mlir::rlc::UncheckedEnumUse>(
 				location,
 				mlir::rlc::UnknownType::get(builder.getContext()),
 				enumName,
 				enumField);
+		if (enumField.empty())
+			EXPECT(Token::Identifier);
+		return toReturn;
 	}
 
 	if (accept<Token::Double>())
@@ -1165,7 +1172,8 @@ llvm::Expected<mlir::rlc::IfStatement> Parser::ifStatement()
 		if (condExp == nullptr)
 			condExp =
 					builder.create<mlir::rlc::Constant>(getCurrentSourcePos(), false);
-		builder.create<mlir::rlc::Yield>(location, mlir::ValueRange(condExp));
+		auto yieldLoc = getCurrentSourcePos();
+		builder.create<mlir::rlc::Yield>(yieldLoc, mlir::ValueRange(condExp));
 
 		builder.setInsertionPointToEnd(trueB);
 		emitYieldIfNeeded(getCurrentSourcePos());
@@ -1342,7 +1350,8 @@ Expected<mlir::rlc::WhileStatement> Parser::whileStatement()
 		builder.setInsertionPointToEnd(condB);
 		if (exp == nullptr)
 			exp = builder.create<mlir::rlc::Constant>(getCurrentSourcePos(), false);
-		builder.create<mlir::rlc::Yield>(location, mlir::ValueRange({ exp }));
+		auto yieldLocation = getCurrentSourcePos();
+		builder.create<mlir::rlc::Yield>(yieldLocation, mlir::ValueRange({ exp }));
 		builder.setInsertionPointToEnd(bodyB);
 		emitYieldIfNeeded(getCurrentSourcePos());
 		builder.restoreInsertionPoint(pos);