-
-
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
Fix #2148: vertical split command #2158
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
054bbf9
Fix :vs and :vsp (vertical split) commands
westim 181b312
Add tests for vertical split command
westim 28f7057
Fix vertical split tests
westim 7348733
Merge branch 'master' into vertical-split
westim b74f852
Move WaitForEditors() to testUtils
westim 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 |
---|---|---|
@@ -0,0 +1,58 @@ | ||
import { ModeHandler } from '../../src/mode/modeHandler'; | ||
import { setupWorkspace, cleanUpWorkspace, assertEqualLines, assertEqual } from './../testUtils'; | ||
import { runCmdLine } from '../../src/cmd_line/main'; | ||
import * as vscode from 'vscode'; | ||
import { join } from 'path'; | ||
import * as assert from 'assert'; | ||
import { getAndUpdateModeHandler } from '../../extension'; | ||
|
||
/** | ||
* Waits for the number of text editors in the current window to equal the | ||
* given expected number of text editors. | ||
* | ||
* @param numEditors Expected number of editors in the window | ||
*/ | ||
async function WaitForEditors(numEditors: number): Promise<void> { | ||
let waitForEditorChange = new Promise((c, e) => { | ||
if (vscode.window.visibleTextEditors.length === numEditors) { | ||
return c(); | ||
} | ||
|
||
let editorChange = vscode.window.onDidChangeVisibleTextEditors(() => { | ||
if (vscode.window.visibleTextEditors.length === numEditors) { | ||
c(); | ||
} | ||
}); | ||
}); | ||
|
||
try { | ||
await waitForEditorChange; | ||
} catch (error) { | ||
assert.fail(null, null, error.toString(), ''); | ||
} | ||
} | ||
|
||
suite('Vertical split', () => { | ||
let modeHandler: ModeHandler; | ||
|
||
setup(async () => { | ||
await setupWorkspace(); | ||
modeHandler = await getAndUpdateModeHandler(); | ||
}); | ||
|
||
teardown(cleanUpWorkspace); | ||
|
||
test('Run :vs', async () => { | ||
await runCmdLine('vs', modeHandler); | ||
await WaitForEditors(2); | ||
|
||
assertEqual(vscode.window.visibleTextEditors.length, 2, 'Editor did not split in 1 sec'); | ||
}); | ||
|
||
test('Run :vsp', async () => { | ||
await runCmdLine('vsp', modeHandler); | ||
await WaitForEditors(2); | ||
|
||
assertEqual(vscode.window.visibleTextEditors.length, 2, 'Editor did not split in 1 sec'); | ||
}); | ||
}); |
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 you move this to
testUtils
? There's probably value in sharing it with other test classes.