Issue #291 better one line scope indentation

[camsteffen]

No description provided.

[qstrahl]

@camsteffen Can you elaborate on what this change addresses? Also you'll need to rebase if you want it merged in

[davidchambers]

Presumably this solves the issue raised in #291:

if(1) return
    console.log('foo')

[qstrahl]

@camsteffen It looks like you merged our develop branch into yours; you will have to undo that change with a git reset --hard b246a506bd1bdfa0827a9861707ffb0b6934b3c5 and instead do a rebase with git rebase refs/remotes/pangloss/develop You will have to resolve the resultant merge conflict.

[camsteffen]

Thanks for helping with the rebase. Hopefully it is set to go now.

To recap the change, the regex now checks to see if there is a statement after the parenthesis for a if|for|while so that if(foo) return does not begin a one line scope. If a line ends with else, then it does begin a one line scope. This pattern could potentially break for something like while("(foo)" === bar) but that is an edge case.

[qstrahl]

I'm willing to try it out for now. We can revert if breakages come up.

[bounceme]

hey, some things are still being indented

function n (err) {
  if (err) return log(err)
    var act = 0
}

another example

function (opts) {
  function log (message) {
    console.error(message)
    if (opts) say(opts, message)
  }
client.on('error', function (message) {
  console.error('Error:', message)
})
}

[camsteffen]

Unfortunately I think we have the best solution possible using regular expressions. It becomes an ultimatum between (1) falsely indent after if(foo) bar() or (2) falsely not indent after if(foo()). I prefer option 1, especially since it can be fixed with a semicolon: if(foo) bar();

[bounceme]

unexpectedly this seems to be working:

let s:one_line_scope_regex = '^[})\]]*\s*\(if\|else\|while\|try\|catch\|finally\|for\|else\s\+if\)\s*_\=$'

gotten from https://github.com/jiangmiao/simple-javascript-indenter/blob/master/indent/javascript.vim#L350

[bounceme]

there isn't indentation when the curly braces are omitted and the statement goes to the next line

[camsteffen]

can you give an example?

[bounceme]

  if (true)
  console.log("value");

that other indent script correctly indents here

[camsteffen]

Your example indents correctly for me...

[bounceme]

did you replace line 69 with

let s:one_line_scope_regex = '^[})\]]*\s*\(if\|else\|while\|try\|catch\|finally\|for\|else\s\+if\)\s*_\=$'

[camsteffen]

No, but now I'm confused. Why are we looking at this other line of code if it doesn't work?

[bounceme]

the indent script that it is copied from, jiangiao's, does correctly indent these different variations of ifs.maybe we can get a similar behavior by looking at other parts of that script to see what he did

[camsteffen]

Sorry, it doesn't solve the problem that I described before:

It becomes an ultimatum between (1) falsely indent after if(foo) bar() or (2) falsely not indent after if(foo()). I prefer option 1, especially since it can be fixed with a semicolon: if(foo) bar();

Here's another way to look at it. Using regular expressions, there is no way to detect whether parenthesis are matching. It can't see if if ( matches with ) at the end of the line.

[bounceme]

well, it may be possible if we try with :h searchpair()

[camsteffen]

Good find, I didn't know about that. Maybe I'll look into it when I have some time. It would be more than a one-liner fix.

[bounceme]

This is what I think would be easiest,though not elegant:

let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*([^()]*)[^()]*\))\)\|=>\)' . s:line_term

This can be extended to allow nesting more than two pairs

[bounceme]

last comment showed two pairs nested,here's what 4 looks like...

let s:one_line_scope_regex = '\%(\%(\<else\>\|\<\%(if\|for\|while\)\>\s*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*(\%([^()]*\|[^()]*([^()]*)[^()]*\))[^()]*\))[^()]*\))\)\|=>\)' . s:line_term