Skip to content

Fix the linematch test #3

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.

Sign up for GitHub

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

Open
sakhnik wants to merge 4 commits into
base: cleanup4
Choose a base branch
from
Open

Fix the linematch test #3

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
164a2f7
Fix the linematch test
sakhnik Apr 25, 2021
e0fa8f8
Revert "Lint the code with `make lint`, introduce a couple of aliases"
sakhnik Apr 25, 2021
ac561f5
Start over from the running version
sakhnik Apr 25, 2021
d15e832
Lint the code (after `make lint`)
sakhnik Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions test/functional/ui/diff_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,24 +1008,24 @@ int main(int argc, char **argv)
]])

feed('G')
feed(':set diffopt+=linematch')
feed(':set diffopt+=linematch\n')
screen:expect([[
{1: }if __name__ == "__{3:│}{1: }if __name__ == "_|
{1: } import sys {3:│}{1: } import sys |
{1: }{9: }{8:app = QWidgets}{3:│}{1: }{9: }{8:comment these}|
{1: }{9: }{8:MainWindow = Q}{3:│}{1: }{9: }{8:#app = QWidge}|
{1: }{9: }{8:ui = UI_}{9:MainWi}{3:│}{1: }{9: }{8:#MainWindow =}|
{1: }{2:------------------}{3:│}{1: }{4: comment these}|
{1: }{9: app = QWidgets}{3:│}{1: }{4: #app = QWidge}|
{1: }{9: MainWindow = Q}{3:│}{1: }{9: }{8:#}{9:MainWindow =}|
{1: }{2:------------------}{3:│}{1: }{4: add a complet}|
{1: }{2:------------------}{3:│}{1: }{4: #ui = UI_Main}|
{1: }{9: ui = UI_MainWi}{3:│}{1: }{4: #ui = UI_Main}|
{1: }{2:------------------}{3:│}{1: }{4: add another n}|
{1: } ui.setupUI(Mai{3:│}{1: } ui.setupUI(Ma|
{1: } MainWindow.sho{3:│}{1: } MainWindow.sh|
{1: } sys.exit(app.e{3:│}{1: } sys.exit(app.|
{6:~ }{3:│}{6:~ }|
{6:~ }{3:│}{6:~ }|
{1: } ui.setupUI(Mai{3:│}{1: }{2:-----------------}|
{1: } MainWindow.sho{3:│}{1: }{2:-----------------}|
{1: } ^sys.exit(app.e{3:│}{1: } ui.setupUI(Ma|
Copy link
Author

@sakhnik sakhnik Apr 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like these lines are misaligned. Did I break the matching algorithm?

Copy link
Author

@sakhnik sakhnik Apr 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I did. Sorry, we'll have to start over again from the working version.

{6:~ }{3:│}{1: } MainWindow.sh|
{6:~ }{3:│}{1: } sys.exit(app.|
{6:~ }{3:│}{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=linematch^ |
:set diffopt+=linematch |
]])
end)
end)
Expand Down