Improve handling of qualified names when renaming #531

toinehartman · 2024-11-26T16:20:15Z

Support renaming fully qualified modules names (instead of last name segment only)
Reject renaming of modules from qualified declaration names.
Explicitly do not support external imports
Support module renames from explorer view.
Escape name segments (\syntax) and v.v.
Resolve module names via dependencies
Use 'did rename' instead of 'will rename' callback, to prevent problems in case the evaluator is locked
Add UI test for module move
Change qualified names on folder rename

DavyLandman

Looks good, with some exceptions that I marked down.

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/BaseWorkspaceService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/IBaseTextDocumentService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServer.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalWorkspaceService.java

rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/Util.rsc

rascal-lsp/src/main/rascal/lang/rascal/lsp/refactor/rename/Modules.rsc

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalWorkspaceService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/BaseLanguageServer.java

DavyLandman

Some small changes, looks mostly fine 👍🏼

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServer.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

rascal-vscode-extension/src/test/vscode-suite/ide.test.ts

DavyLandman

Looks good, 2 points that we should still pay attention to:

the work inside the eval closure should really only call the evaluator, nothing more (just to avoid deadlocks), I've left a comment where it's happening.
the test currently fails.

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalWorkspaceService.java

Find imports by import path instead of module name.

This reverts commit e93a8dd.

DavyLandman

Some minor comments, but looks good. Also thinks @sungshik for the help with the UI tests.

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalLanguageServices.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalTextDocumentService.java

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalWorkspaceService.java

sonarqubecloud · 2024-12-23T14:51:21Z

Quality Gate passed

Issues
8 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

DavyLandman · 2024-12-24T19:10:33Z

@toinehartman looks like it's ready to merge, want to do the honors?

toinehartman self-assigned this Nov 26, 2024

toinehartman force-pushed the fix/rename-refactoring/module-names branch from 2e00c0b to 046df83 Compare November 26, 2024 16:25

toinehartman mentioned this pull request Nov 26, 2024

Renaming a module whose name occurs in a qualified function call fails #524

Closed

toinehartman force-pushed the fix/rename-refactoring/module-names branch 2 times, most recently from 63a2866 to 9f8d64b Compare December 2, 2024 11:50

toinehartman force-pushed the fix/rename-refactoring/module-names branch 2 times, most recently from 83be677 to 9dc8e7d Compare December 5, 2024 10:50

DavyLandman requested changes Dec 6, 2024

View reviewed changes

DavyLandman reviewed Dec 6, 2024

View reviewed changes

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/RascalWorkspaceService.java Outdated Show resolved Hide resolved

toinehartman force-pushed the fix/rename-refactoring/module-names branch from 05284c1 to dd91729 Compare December 9, 2024 13:08

DavyLandman reviewed Dec 10, 2024

View reviewed changes

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/BaseLanguageServer.java Show resolved Hide resolved

toinehartman marked this pull request as ready for review December 10, 2024 14:00

toinehartman requested a review from DavyLandman December 10, 2024 14:10

DavyLandman requested changes Dec 10, 2024

View reviewed changes

toinehartman requested a review from DavyLandman December 12, 2024 15:23

DavyLandman approved these changes Dec 12, 2024

View reviewed changes

toinehartman force-pushed the fix/rename-refactoring/module-names branch 2 times, most recently from 308fcd9 to 5491327 Compare December 16, 2024 15:42

toinehartman added 12 commits December 17, 2024 18:07

Prepare qualified names for renaming.

126ed67

Perform validity checks outside of changed file iteration.

3a333cc

Implement renaming fully qualified names.

bd0cfbe

Fix bug where qualified prefix would be renamed based on length only.

26c531e

Find imports by import path instead of module name.

Add self-qualified test.

36801b1

Do not support renaming external imports.

7656e0e

Implement Rascal workspace service.

9ae1b47

Implement Java-based will-rename-files callback.

15e31d1

Pair services in language server.

2ec68d7

Move module rename analysis from Java to Rascal.

9097412

Fix lint error.

e816deb

Fix import resolution when renaming module.

853b4fa

Log value of drap and drop targets.

cbbdd83

toinehartman force-pushed the fix/rename-refactoring/module-names branch from 033259a to 0373f5f Compare December 17, 2024 17:47

Temporarily disable other tests.

e93a8dd

toinehartman force-pushed the fix/rename-refactoring/module-names branch from 0373f5f to e93a8dd Compare December 18, 2024 12:46

toinehartman and others added 14 commits December 18, 2024 15:34

Use working method for moving files.

b9abd61

Clean up test.

cf76e51

Check evaluators before normal rename test as well.

8d3daa2

Take some screenshots to debug macOS.

b55976f

More checks.

d38d331

Revert "Temporarily disable other tests."

ea6f7e1

This reverts commit e93a8dd.

Wait for context menu clicks.

ab3fba4

Try special approach for macOS.

6969b5f

Fix rename test for macOS (special case)

ea21fce

Clean up "renaming files works"

da3c084

Remove unused import

319664e

Add missing semicolon

a95c34b

Clean up some unnecessary waits.

03cb83b

Support folder renames and move code to Rascal.

7793bd0

toinehartman requested a review from sungshik December 23, 2024 09:12

Handle empty failure reason.

a262066

toinehartman requested a review from DavyLandman December 23, 2024 12:07

DavyLandman approved these changes Dec 23, 2024

View reviewed changes

toinehartman force-pushed the fix/rename-refactoring/module-names branch 2 times, most recently from a3e18f6 to a262066 Compare December 23, 2024 14:15

toinehartman added 3 commits December 23, 2024 15:26

Explicitly pass executor.

c81ff47

Clean up code.

b3f0dc9

Improve function name.

15c8587

toinehartman mentioned this pull request Dec 23, 2024

Add non-throwing variant of createFromURI. usethesource/rascal#2113

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve handling of qualified names when renaming #531

Improve handling of qualified names when renaming #531

toinehartman commented Nov 26, 2024 •

edited

Loading

DavyLandman left a comment

DavyLandman left a comment

DavyLandman left a comment

DavyLandman left a comment

sonarqubecloud bot commented Dec 23, 2024

DavyLandman commented Dec 24, 2024

Improve handling of qualified names when renaming #531

Are you sure you want to change the base?

Improve handling of qualified names when renaming #531

Conversation

toinehartman commented Nov 26, 2024 • edited Loading

DavyLandman left a comment

Choose a reason for hiding this comment

DavyLandman left a comment

Choose a reason for hiding this comment

DavyLandman left a comment

Choose a reason for hiding this comment

DavyLandman left a comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Dec 23, 2024

Quality Gate passed

DavyLandman commented Dec 24, 2024

toinehartman commented Nov 26, 2024 •

edited

Loading