-
Notifications
You must be signed in to change notification settings - Fork 126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversion shortcuts to Typescript #807
Conversation
I used |
You can see on the "Files Changed" tab that many files have been deleted and recreated rather than renamed. You'll need to fix this so that they are renamed, otherwise we lose continuity of the git history. I would try an interactive rebase where you can reset the deleted file and try again. I have had issues with renames before, so it's not uncommon. Maybe you can search online and find a proper explanation and solution.
Okay, thanks |
Okay, i will google it |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you provide an update? We need to get this merged. Thanks!
Yes, sorry, i was a little loaded with other issues. I will provide changes today or tomorrow! |
e8c2e4f
to
b62faf6
Compare
Raine, hi! I've tested all files, but i'm not confident with bindContext (i can't figure out what this feature does, i tried invoking alt + shift + b on a Thoughh and then adding children to Thought's context or to Thought itself, but nothing changes), cursorForward (it did nothing for me on commits before conversion and after), deleteEmptyThoughtOrOutdent (in case when we have
setting cursor on I think we need to add tests for cursor and newThought.../newSubthoughts shortcuts in order to be confident that everything works. After conversion code passed all tests, but some issues were found out in testing all shortcuts by hand. Also i haven't succeed in renaming files. Git uses diff algorithm for defining whether file was renamed or deleted/created. If difference between 2 files is more than 50%, git decides it is deleting one file and creating another. We can rename file in one commit, update in another and then everything will be fine. But as i understand such solution isn't acceptable, isn't it? I have stopped further research because it takes a lot of time, and i wait for your opinion. Thanks! |
Yes,
This sounds like a separate issue then. I haven't tested nested empty thoughts, so there could indeed by issues there. Could you create an issue for this?
What testsdo you believe are missing?
As you probably are aware, you are responsible for identifying exactly which commits caused the regressions.
Well, that explains the mystery at least! Thanks for looking into it.
I think renaming within a separate commit would be perfectly fine. And it would have the advantage of preserving history continuity. What do you think? |
I think they also should be tested within shortcuts. At least cursorUp and cursorDown. They have its logic before dispatching cursor action. E.g. part of cursorUp and cursorDown behavior was unexpected, because after conversion these lines of code were calculated incorrect Line 32 in 07b1155
em/src/shortcuts/cursorDown.js Line 42 in 07b1155
|
Agree with you |
Yes, will do it right now |
Got it, thank you |
8ceb8c4
to
4f48163
Compare
4f48163
to
39cde5f
Compare
It's strange, but we are still having this problem. e.g. cursorBack in "Files Changed" tab is displayed as deleted and added, but actually in commits it was renamed and modified: 692f197 8c95809 I found this PR (refined-github/refined-github#1750), there is the same problem and they solve it this way: refined-github/refined-github#1750 (comment) |
That's informative, thanks. Apparently git really does just do an add+remove, and renaming is inferred using a heuristic. Maybe doing the rename in a separate PR would work. We can try that next time. For now, I'm happy moving forward with this as-is. Worst case, when tracing the history of a file it will come to an obvious stop, and we can browse the repo at the previous commit to find the renamed file manually and trace it back further if needed. |
@pushkov-fedor I did some more research on |
Fixes #519