Merge branch 'main' into chore/new-faster-rascal-core

usethesource · Nov 27, 2024 · cbb5e70 · cbb5e70
2 parents af04c3b + 0a8f478
commit cbb5e70
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Exception.rsc b/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Exception.rsc
@@ -40,7 +40,7 @@ data IllegalRenameReason
     | definitionsOutsideWorkspace(set[loc] defs)
     ;
 
-data RuntimeException
+data RenameException
     = illegalRename(str message, set[IllegalRenameReason] reason)
     | unsupportedRename(str message, rel[loc location, str message] issues = {})
     | unexpectedFailure(str message)

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Rename.rsc b/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Rename.rsc
@@ -37,6 +37,7 @@ module lang::rascal::lsp::refactor::Rename
 
 import Exception;
 import IO;
+import Grammar;
 import List;
 import Location;
 import Map;
@@ -76,35 +77,24 @@ void throwAnyErrors(program(_, msgs)) {
     throwAnyErrors(msgs);
 }
 
-set[IllegalRenameReason] rascalCheckLegalName(str name, set[IdRole] defRoles) {
-    set[IllegalRenameReason] tryParseAs(type[&T <: Tree] begin, str idDescription) {
-        try {
-            parse(begin, rascalEscapeName(name));
-            return {};
-        } catch ParseError(_): {
-            return {invalidName(name, idDescription)};
-        }
-    }
+private set[IllegalRenameReason] rascalCheckLegalName(str name, set[IdRole] roles) {
+    escName = rascalEscapeName(name);
+    tuple[type[&T <: Tree] as, str desc] asType = <#Name, "identifier">;
+    if ({moduleId(), *_} := roles) asType = <#QualifiedName, "module name">;
+    if ({constructorId(), *_} := roles) asType = <#NonterminalLabel, "constructor name">;
+    if ({fieldId(), *_} := roles) asType = <#NonterminalLabel, "constructor field name">;
+    if (size(syntaxRoles & roles) > 0) asType = <#Nonterminal, "non-terminal name">;
 
-    bool isSyntaxRole = any(role <- defRoles, role in syntaxRoles);
-    bool isField = any(role <- defRoles, role is fieldId);
-    bool isConstructor = any(role <- defRoles, role is constructorId);
+    if (!tryParseAs(asType.as, escName)) return {invalidName(escName, asType.desc)};
+    return {};
+}
 
-    set[IllegalRenameReason] reasons = {};
-    if (isSyntaxRole) {
-        reasons += tryParseAs(#Nonterminal, "non-terminal name");
-    }
-    if (isField) {
-        reasons += tryParseAs(#NonterminalLabel, "constructor field name");
+private void rascalCheckLegalName(str name, Symbol sym) {
+    escName = rascalEscapeName(name);
+    g = grammar(#start[Module]);
+    if (!tryParseAs(type(sym, g.rules), escName)) {
+        throw illegalRename("\'<escName>\' is not a valid name at this position", {invalidName(escName, "<sym>")});
     }
-    if (isConstructor) {
-        reasons += tryParseAs(#NonterminalLabel, "constructor name");
-    }
-    if (!(isSyntaxRole || isField || isConstructor)) {
-        reasons += tryParseAs(#Name, "identifier");
-    }
-
-    return reasons;
 }
 
 private set[IllegalRenameReason] rascalCheckDefinitionsOutsideWorkspace(WorkspaceInfo ws, set[loc] defs) =
@@ -531,6 +521,8 @@ Edits rascalRenameSymbol(Tree cursorT, set[loc] workspaceFolders, str newName, P
     loc cursorLoc = cursorT.src;
     str cursorName = "<cursorT>";
 
+    rascalCheckLegalName(newName, typeOf(cursorT));
+
     step("collecting workspace information", 1);
     WorkspaceInfo ws = workspaceInfo(
         // Get path config

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc b/rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc
@@ -30,6 +30,7 @@ import IO;
 import List;
 import Location;
 import Message;
+import ParseTree;
 import String;
 
 import util::Maybe;
@@ -79,6 +80,18 @@ start[Module] parseModuleWithSpacesCached(loc l) {
     return parseModuleWithSpacesCached(l, lastModified(l));
 }
 
+@synopsis{
+    Try to parse string `name` as reified type `begin` and return whether this succeeded.
+}
+bool tryParseAs(type[&T <: Tree] begin, str name, bool allowAmbiguity = false) {
+    try {
+        parse(begin, name, allowAmbiguity = allowAmbiguity);
+        return true;
+    } catch ParseError(_): {
+        return false;
+    }
+}
+
 Maybe[&B] flatMap(nothing(), Maybe[&B](&A) _) = nothing();
 Maybe[&B] flatMap(just(&A a), Maybe[&B](&A) f) = f(a);
 

diff --git a/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/ValidNames.rsc b/rascal-lsp/src/main/rascal/lang/rascal/tests/rename/ValidNames.rsc
@@ -57,3 +57,6 @@ test bool newNameHasNumericPrefix() = testRename("int foo = 8;", newName = "8abc
 
 @expected{illegalRename}
 test bool newNameIsEscapedInvalid() = testRename("int foo = 8;", newName = "\\8int");
+
+@expected{illegalRename}
+test bool qualifiedNameWhereNameExpected() = testRename("int foo = 8;", newName = "Foo::foo");