Continue indentation in multiline dictionary, array or tuple #3

Merged

mattpauldavies merged 3 commits from main into main

2021-07-20 19:02:17 +02:00

mattpauldavies commented

2021-07-20 17:04:34 +02:00

(Migrated from github.com)

Following the update in this commit and this discussion; here is a suggested PR to continue indentation in dictionary, array or tuple blocks.

Currently when you hit return to create an array, dictionary or tuple block the cursor maintains the base indentation:

a = {
| # <- cursor here after return
}

b = [
| # <- cursor here after return
]

c = (
| # <- cursor here after return
)

This PR adds TupleExpression: continuedIndent(), DictionaryExpression: continuedIndent() and ArrayExpression: continuedIndent() to indentNodeProp which gives the following experience:

a = {
  | # <- cursor here after return
}

b = [
  | # <- cursor here after return
]

c = (
  | # <- cursor here after return
)

Following the update in [this commit](https://github.com/codemirror/lang-python/commit/11078ad3fc08fac5eda676e363226eef2d65d0bb) and [this discussion](https://github.com/codemirror/codemirror.next/issues/538); here is a suggested PR to continue indentation in dictionary, array or tuple blocks. Currently when you hit return to create an array, dictionary or tuple block the cursor maintains the base indentation: ```python a = { | # <- cursor here after return } b = [ | # <- cursor here after return ] c = ( | # <- cursor here after return ) ``` This PR adds `TupleExpression: continuedIndent()`, `DictionaryExpression: continuedIndent()` and `ArrayExpression: continuedIndent()` to `indentNodeProp` which gives the following experience: ```python a = { | # <- cursor here after return } b = [ | # <- cursor here after return ] c = ( | # <- cursor here after return ) ```

marijnh commented

2021-07-20 17:12:11 +02:00

(Migrated from github.com)

Good idea! Not sure why those aren't there yet. I think delimitedIndent is a better match for these though, since it allows the end bracket to be deindented (as in your examples), and supports 'aligned' indentation when elements start on the line of the opening bracket.

Good idea! Not sure why those aren't there yet. I think [`delimitedIndent`](https://codemirror.net/6/docs/ref/#language.delimitedIndent) is a better match for these though, since it allows the end bracket to be deindented (as in your examples), and supports 'aligned' indentation when elements start on the line of the opening bracket.

mattpauldavies commented

2021-07-20 18:22:23 +02:00

(Migrated from github.com)

Ahh thanks, @marijnh, I wasn't 100% sure which was the best method to use. Updated accordingly 👍

marijnh commented

2021-07-20 19:02:24 +02:00

(Migrated from github.com)

Thanks!

👍 1

microbit-matt-hillsdon (Migrated from github.com) reviewed

2021-07-24 13:50:39 +02:00

src/python.ts

These aren't compiling for me.

I think they're missing a value for closing.

https://github.com/codemirror/language/blob/main/src/indent.ts#L264

Compare with:

https://github.com/codemirror/lang-javascript/blob/main/src/javascript.ts#L23

These aren't compiling for me. I think they're missing a value for `closing`. https://github.com/codemirror/language/blob/main/src/indent.ts#L264 Compare with: https://github.com/codemirror/lang-javascript/blob/main/src/javascript.ts#L23