-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Editor Scroll #681
Merged
Merged
Editor Scroll #681
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
2922217
update with new API signature
rebornix 3366299
disable side effect of updateview for editor scroll
rebornix d1e6dd5
zb, zt
rebornix fe10f38
fix #677
rebornix d05c6a1
fix typo
rebornix 3d9237e
postpone Code view change to viewUpdate phase
rebornix 6589e90
string union types
rebornix File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,11 @@ export enum VimSpecialCommands { | |
Dot | ||
} | ||
|
||
export class ViewChange { | ||
public name: string; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: maybe rename this to |
||
public args: any; | ||
} | ||
|
||
/** | ||
* The VimState class holds permanent state that carries over from action | ||
* to action. | ||
|
@@ -68,6 +73,13 @@ export class VimState { | |
|
||
public focusChanged = false; | ||
|
||
/** | ||
* Every time we invoke a VS Code command which might trigger Code's view update, | ||
* we should postpone its view updating phase to avoid conflicting with our internal view updating mechanism. | ||
* This array is used to cache every VS Code view updating event and they will be triggered once we run the inhouse `viewUpdate`. | ||
*/ | ||
public postponedCodeViewChanges: ViewChange[] = []; | ||
|
||
/** | ||
* Used to prevent non-recursive remappings from looping. | ||
*/ | ||
|
@@ -1088,6 +1100,15 @@ export class ModeHandler implements vscode.Disposable { | |
|
||
vscode.window.activeTextEditor.setDecorations(this._caretDecoration, rangesToDraw); | ||
|
||
if (this.vimState.postponedCodeViewChanges.length > 0) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is this outside |
||
for (let i = 0; i < this.vimState.postponedCodeViewChanges.length; i++) { | ||
let viewChange = this.vimState.postponedCodeViewChanges[i]; | ||
await vscode.commands.executeCommand(viewChange.name, viewChange.args); | ||
} | ||
|
||
this.vimState.postponedCodeViewChanges = []; | ||
} | ||
|
||
if (this.currentMode.name === ModeName.SearchInProgressMode) { | ||
this.setupStatusBarItem(`Searching for: ${ this.vimState.searchState!.searchString }`); | ||
} else { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Can we create enums for
to
andby
values?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.
Sure, that's definitely necessary.