Update import on file rename #2651

jasonlyu123 · 2021-01-27T14:40:20Z

related to #820
have to introduce some new API to IScriptHost and ProjectService because the request is not similar to the existing features. ~~Haven't done the integration test Because I end up using the applyEdit request. I can't find a set of vscode API that can be used to test it. Maybe we can just test it in the server test?~~

Looking forward to feedbacks if anyone can found some strange behavior.

so that unopened file can also be checked

Also change the event to didRename because willRename won't show confirmation

…mport

jasonlyu123 · 2021-02-03T07:59:26Z

I see a new confirm UI in 1.53 insider. I think I can remove the custom confirmation. And we can wait until that was released and use the official confirmation instead.

vscode 1.53 add confirmation for rename file so change annotation works on will rename

pakohan · 2021-02-04T09:19:15Z

Hey, I'm really looking forward, but never touched development of VSCode plugins. If it's helpful for you, could you tell me how to test this?

Again, thank you for this missing feature :-)

jasonlyu123 · 2021-02-04T09:31:22Z

You can check out my branch and follow the doc here.
Following the debug step and you will see a debug vscode window pops up. Just open a folder and you can try it out. ~~You can also use the vscode insider version to debug it.~~(it's released) And you will see the confirmation I mentioned.

yoyo930021 · 2021-02-12T14:14:25Z

I'm so sorry about no immediate feedback provided.

I always thought there would be a conflict with VSCode typescript integration.
If you think there is nothing wrong with this, we can try to release it.

yoyo930021

Thanks for your help.

server/src/modes/script/javascript.ts

server/src/services/typescriptService/serviceHost.ts

server/src/services/vls.ts

pakohan · 2021-02-15T16:56:25Z

Finally got the time to try it out. It works! I can't wait for the official release :-)

…mport

test/lsp/features/renameFiles/basic.test.ts

server/src/modes/script/javascript.ts

vscode 1.53 would always ask confirmation and provide option for preview

jasonlyu123 · 2021-02-18T04:55:01Z

I always thought there would be a conflict with VSCode typescript integration.

About this maybe we can filter out all the edits to js and ts files?

pakohan · 2021-02-18T14:43:43Z

I've checked out the latest commit and might be doing sth. wrong, but it's not working anymore:

Trace: TypeError: Cannot read property 'getProjectVersion' of undefined
    at synchronizeHostData (/Users/mogli/Desktop/vetur-update-import/server/node_modules/typescript/lib/typescript.js:147068:22)
    at getProgram (/Users/mogli/Desktop/vetur-update-import/server/node_modules/typescript/lib/typescript.js:147233:13)
    at Object.getEditsForFileRename (/Users/mogli/Desktop/vetur-update-import/server/node_modules/typescript/lib/typescript.js:147629:45)
    at Object.getRenameFileEdit (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:674:4288)
    at Object.onWillRenameFile (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:3433)
    at /Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:16256
    at async Promise.all (index 0)
    at async GP.onWillRenameFiles (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:16145)
    at Object.getRenameFileEdit (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:674:4968)
    at Object.onWillRenameFile (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:3433)
    at /Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:16256
    at async Promise.all (index 0)
    at async GP.onWillRenameFiles (/Users/mogli/Desktop/vetur-update-import/server/dist/vls.js:858:16145)

pakohan · 2021-02-18T15:58:30Z

btw, is there any way to stop the operation so that the file does not get moved?

jasonlyu123 · 2021-02-19T04:04:48Z

I've checked out the latest commit and might be doing sth. wrong, but it's not working anymore:

I can't reproduce this. Is it not working at all? or it's only in a specific situation? Also, I have pulled the latest commits of the master branch to resolve the merging conflict. You'll have to run yarn again.

btw, is there any way to stop the operation so that the file does not get moved?

The confirm windows of vscode 1.53 have a skip option. it would skip all the edits. And you can undo rename file like a normal undo(Ctrl+Z).

If both renamed file and updating file are not vue file, let typescript extension handle it.

yoyo930021 · 2021-02-26T10:13:13Z

I always thought there would be a conflict with VSCode typescript integration.

About this maybe we can filter out all the edits to js and ts files?

If the test is not a problem, perhaps we can observe.

yoyo930021

LGTM, If no any question, I will merge it.

no longer needed to redirect to new file because this is run before actual file rename

jasonlyu123 · 2021-02-26T15:18:32Z

Can anyone check it for me? The new test I added works for me on windows. But I just can't figure out why it doesn't work on the Linux test. Open the test/lsp/fixure directory in debugging and move the Basic.vue into a new subfolder. Does it work?
Got reproducible in WSL. Have to do more checking.

we can't use getSourceDoc here. It doesn't have the info we need.

jasonlyu123 · 2021-03-02T07:22:12Z

server/src/modes/script/javascript.ts

-        ? getUserPreferences(updateCurrentVueTextDocument(sourceFileToSourceDoc(oldPath, sourceFile)).scriptDoc)
-        : getUserPreferencesByLanguageId(oldPath.endsWith('.js') ? 'javascript' : 'typescript');
+      const preferences = getUserPreferencesByLanguageId(
+        (sourceFile as any).scriptKind === tsModule.ScriptKind.JS ? 'javascript' : 'typescript'


Can't use sourceFileToSourceDoc or getSourceDoc here. It would treat the script content as a vue file. Thus it would get a default script content instead. It only works sometimes because of the caching.
I was hesitant about whether to use this typescript internal API or expose another getScriptKind function from serviceHost

I'm guessing you mean getLanguageModelCache......
I also want to remove this cache.

I think we can keep the way you write for now.

@jasonlyu123 If you don't have any problem, I will release it in new version.

jasonlyu123 and others added 7 commits January 23, 2021 12:07

first crack at update import

c470ce7

directly execute with javascript mode

eb6edb8

so that unopened file can also be checked

config

e7e9a0b

Also change the event to didRename because willRename won't show confirmation

fix update import edit on the old document

141b04b

cleanup

8679e5f

test for update import

a5e96d6

Merge branch 'master' of https://github.com/vuejs/vetur into update-i…

f0b5fb3

…mport

jasonlyu123 marked this pull request as ready for review February 3, 2021 02:48

jasonlyu123 added 2 commits February 3, 2021 16:35

change back to will rename

2fcd521

vscode 1.53 add confirmation for rename file so change annotation works on will rename

fix rename file test cleanup

7ac5726

w3bdesign approved these changes Feb 6, 2021

View reviewed changes

yoyo930021 requested changes Feb 12, 2021

View reviewed changes

jasonlyu123 added 3 commits February 17, 2021 08:59

Merge branch 'master' of https://github.com/vuejs/vetur into update-i…

89d8728

…mport

implement turning off update import on file move

0466b8f

review feedback

7cf0b97

jasonlyu123 commented Feb 17, 2021

View reviewed changes

test/lsp/features/renameFiles/basic.test.ts Outdated Show resolved Hide resolved

yoyo930021 reviewed Feb 17, 2021

View reviewed changes

server/src/modes/script/javascript.ts Outdated Show resolved Hide resolved

simplify updateImportOnFileMove config

a3f5e72

vscode 1.53 would always ask confirmation and provide option for preview

jasonlyu123 added 3 commits February 19, 2021 17:03

get user preference for non vue file

4967fa6

filter out non vue update import

f30353a

If both renamed file and updating file are not vue file, let typescript extension handle it.

test renameFiles with lsp request

8d14820

remove no longer needed config in the test dir

2b90800

yoyo930021 approved these changes Feb 26, 2021

View reviewed changes

fix update import in the renaming file

272085e

no longer needed to redirect to new file because this is run before actual file rename

jasonlyu123 force-pushed the update-import branch from 391a58a to 272085e Compare February 26, 2021 15:12

get preferences by sourceFile scriptKind

ebac859

we can't use getSourceDoc here. It doesn't have the info we need.

jasonlyu123 commented Mar 2, 2021

View reviewed changes

yoyo930021 merged commit f9369d9 into vuejs:master Mar 2, 2021

This was referenced Mar 11, 2021

Bump vls from 0.4.2 to 0.7.2 in /vti AlexandreBonaventure/vetur#91

Closed

Bump vls from 0.4.2 to 0.7.2 in /vti rchl/vetur#62

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update import on file rename #2651

Update import on file rename #2651

jasonlyu123 commented Jan 27, 2021 •

edited

jasonlyu123 commented Feb 3, 2021

pakohan commented Feb 4, 2021

jasonlyu123 commented Feb 4, 2021 •

edited

yoyo930021 commented Feb 12, 2021

yoyo930021 left a comment

pakohan commented Feb 15, 2021

jasonlyu123 commented Feb 18, 2021

pakohan commented Feb 18, 2021

pakohan commented Feb 18, 2021

jasonlyu123 commented Feb 19, 2021 •

edited

yoyo930021 commented Feb 26, 2021

yoyo930021 left a comment

jasonlyu123 commented Feb 26, 2021 •

edited

jasonlyu123 Mar 2, 2021

yoyo930021 Mar 2, 2021

yoyo930021 Mar 2, 2021

jasonlyu123 Mar 2, 2021

Update import on file rename #2651

Update import on file rename #2651

Conversation

jasonlyu123 commented Jan 27, 2021 • edited

jasonlyu123 commented Feb 3, 2021

pakohan commented Feb 4, 2021

jasonlyu123 commented Feb 4, 2021 • edited

yoyo930021 commented Feb 12, 2021

yoyo930021 left a comment

Choose a reason for hiding this comment

pakohan commented Feb 15, 2021

jasonlyu123 commented Feb 18, 2021

pakohan commented Feb 18, 2021

pakohan commented Feb 18, 2021

jasonlyu123 commented Feb 19, 2021 • edited

yoyo930021 commented Feb 26, 2021

yoyo930021 left a comment

Choose a reason for hiding this comment

jasonlyu123 commented Feb 26, 2021 • edited

jasonlyu123 Mar 2, 2021

Choose a reason for hiding this comment

yoyo930021 Mar 2, 2021

Choose a reason for hiding this comment

yoyo930021 Mar 2, 2021

Choose a reason for hiding this comment

jasonlyu123 Mar 2, 2021

Choose a reason for hiding this comment

jasonlyu123 commented Jan 27, 2021 •

edited

jasonlyu123 commented Feb 4, 2021 •

edited

jasonlyu123 commented Feb 19, 2021 •

edited

jasonlyu123 commented Feb 26, 2021 •

edited