Fix #358. #399
Fix #358. #399
Conversation
|
I'm holding off on merging this because now we track both activeFileName and activeFileIdentity, which seems confusing. activeFileName was intended to be the identity of the active file anyways. Can you think of a way to merge both of them into one? |
|
@johnfn yeah |
|
@rebornix, you're still working on one common file identity? |
|
@jpoon sorry for the delay, I'll update this PR later today together with other PRs. |
|
Add a new class for File/Editor Identity. I was trying to put the declaration into |
| @@ -11,38 +11,83 @@ import { showCmdLine } from './src/cmd_line/main'; | |||
| import { ModeHandler } from './src/mode/modeHandler'; | |||
| import { TaskQueue } from './src/taskQueue'; | |||
| import { Position } from './src/motion/position'; | |||
| <<<<<<< aa8f6051a847c442e374ce22920ca5bd21835aec | |||
There was a problem hiding this comment.
You still have a merge conflict here
|
Rebase and fix conflicts. |
| return this.fileName === identity.fileName && this.viewColumn === identity.viewColumn; | ||
| } | ||
|
|
||
| public withColumn(column: vscode.ViewColumn): EditorIdentity { |
There was a problem hiding this comment.
Sorry for the nitpick. Where is this function used? Do we need it?
There was a problem hiding this comment.
Oh it's not used for now, I thought this can be used to update Identity by column but finally it's not yet necessary. If other parts are good, I'll remove it and push a update.
There was a problem hiding this comment.
Yep, that's the only comment I have :). We can merge following that removal.
|
@jpoon we are good to go now :) |
|
Thanks @rebornix! 🎈 |
Yay! We love PRs! 🎊
Please include a description of your change & check your PR against this list, thanks:
gulp tslint)From my observation, if you open the same file twice in two window viewport inside a single tab, these two viewports are sharing the same buffer. The history is shared between these two viewports, selection is shared either. The only thing not shared is current cursor position in normal mode, totally no idea why is that.
VS Code takes almost the same concept, if we open the same file in two Grouped Editors, they are sharing the same buffer. And VS Code doesn't share cursor between these two panes either. So each time when we switch between two panes which open the same file, we just reassign the cursor position to
vimState. That's all we need to handle as VS Code stores everything about the buffer like Vim does.The only thing that might break is history. But currently everything works fine.
I added test cases for this change on my local box. But it turned out that VS Code
splitEditororfocusPreviousGrouporfocusNextGroupdoesn't move the active cursor to target Group Editor. So our correct code can never pass test cases and it's false negative. So before VS Code test library has a fix for this thing, I'd like to keep the test cases on my local box. But I've tested this fix manually, it works.