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

Develop -> Master #604

Merged
merged 52 commits into from
Aug 21, 2016
Merged

Develop -> Master #604

merged 52 commits into from
Aug 21, 2016

Conversation

bounceme
Copy link
Collaborator

All indent related. By the way, this will be making it's way into vim(as an update to the slightly outdated file from this repo already in the newest releases), so please try it and report bugs!

I know of no regressions caused by these commits.

bounceme added 30 commits July 29, 2016 00:00
make sure to calculate switch_offset even when using 'c-style' and fix block comments at the very top of a file
* fix ftplugin var and clean indent
* remove line comment appended to code
* add label support
* case-sensitivity
easier to read in one line
javascript allows for much more than just [A-Za-z] for identifiers. this is also faster on more recent versions of vim.
changes operator behavior inside of invoking parens, object literals, and arrays.
so it appears that my testing didn't reveal this because I use (and apparently most people use):
```
function a() {
  var i = 1,
    c = 2
}
```
instead of:
```
function a(){
  var i = 1,
    c = 2
}
```
keep forgetting this
* Readme Updates

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md
this uses the same algorithm from https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader which the acorn parser also uses. it actually is basically the same as what i had originally but with support for labeled block statements and plain block statements.
cleaning and improving readability
@bounceme
Copy link
Collaborator Author

bounceme commented Aug 17, 2016

i'll probably squash this down when I merge (not going to rebase it though) since they mostly consist of iterative changes which over-wrote each other. With this update there shouldn't be any noticeable changes to the results of indenting,though the code is more readable and robust

@bounceme
Copy link
Collaborator Author

@amadeus I think this can be merged, i'm prepared to fix any resulting bugs if i'm wrong about the stability. Doesn't seem anyone else is testing this either

Later on tonight or tomorrow?

@amadeus
Copy link
Collaborator

amadeus commented Aug 17, 2016

I want to look into the async stuff before this gets merged. Also lets NOT squash this into master, I'd like to keep the history intact, in case we want to revert a specific commit or something, or need to git bisect.

I'll try to make a point of getting the async stuff started tonight. I also have a small flow bug or two that I'd like to get fixed as well.

these don't seem to be very relevant when using indentexprs, and may override the indentation script,

opinions on this are welcomed, and honestly I don't know exactly what effect these have. the clojure indent file and a few others included with vim has these options set to off
small regex improvements
@bounceme
Copy link
Collaborator Author

have any changes for this update @amadeus ? if not, tomorrow i'll merge, otherwise i will wait if you care for making this a full repo update

@bounceme
Copy link
Collaborator Author

better to get this out now is my opinion. It is a moderately sized indent update, and seems stable

@bounceme bounceme merged commit 782cc10 into master Aug 21, 2016
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.

2 participants