Skip to content
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

incremental document handling #54

Closed
wants to merge 13 commits into from
Closed

incremental document handling #54

wants to merge 13 commits into from

Conversation

ZacLN
Copy link
Contributor

@ZacLN ZacLN commented Nov 15, 2016

@davidanthoff could you see if this works when you get a chance?

This parses documents into blocks, runs the linter on the individual blocks and picks up some information about local variables for functions.

When a didChange event happens it marks blocks intersect with the change and re-parses only those affected...ish. Saving the file parses everything afresh.

The line numbers on diagnostics are a bit wonky

@davidanthoff
Copy link
Member

@ZacLN Can you resolve the merge conflict?

@ZacLN
Copy link
Contributor Author

ZacLN commented Nov 16, 2016

Yep, let me close this

@ZacLN ZacLN closed this Nov 16, 2016
@davidanthoff
Copy link
Member

There is in general no need to close PR to resolve a merge conflict. Normally it should be enough that you do the following locally on your machine:

  1. make sure you have pulled the latest master
  2. checkout your branch (i.e. allrange)
  3. merge master into allrange
  4. resolve any merge conflict
  5. push allrange

That should normally do the trick. Main benefit is that we don't loose the discussion history here.

@ZacLN
Copy link
Contributor Author

ZacLN commented Nov 16, 2016

arg, appologies for that

@davidanthoff
Copy link
Member

No need to apologize, what you are contributing here is just plain amazing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants