Spread not highlighted correctly

[texastoland]

Looking at the grammar file I assume it just hasn't been added yet. Minimal repro:

[...$stuff]
{ ...$stuff }

[fdncred]

Are these the only two variations? It would be good to have an example of each variation so they can be validated.

I can see that { ...$rest } seems correct and is called variable.other.nushell but [...$rest] isn't recognized properly and it's either string.bare.nushell or keyword.control.nushell depending on where you click on the text.

@glcraft Thoughts on this?

[texastoland]

I can see that { ...$rest } seems correct

They highlight identically for me. The first .. is highlighted like match then the rest like a bare identifier.

[fdncred]

Not identical for me.

[fdncred]

Now that I look closer, neither of them are recognized correctly but one is closer than the other.

You can see this menu with ctrl+shift+p Developer: Inspect Editor Tokens and Scope

[texastoland]

It looks like our themes target different scopes. I confirmed they both change scopes inside the spread.

[fdncred]

@texastoland Are you on the latest version of the extension v1.8.0?

[texastoland]

I am. You should see the same behavior if you inspect the operator. Your theme is just highlighting fewer scopes.

The right fix looks adapting (and renaming) the ranges regex to permit a third dot:

vscode-nushell-lang/syntaxes/nushell.tmLanguage.json

Lines 186 to 189 in bd9d19f

	"ranges": {
	"match": "\\.\\.<?|:",
	"name": "keyword.control.nushell"
	},

To: "\\.\\.[<.]?" (|: appears to be a mistake). There are other operator groups but they're surrounded by spaces. PR?

[fdncred]

What theme are you using? I'd like to be able to see the difference.

[texastoland]

Oh just checked my other themes but they're like yours. Screenshot using Tinacious Design.

[fdncred]

That range fix may be helpful but I don't think it's the entire solution. I don't think we should be getting multiple primary textmate scopes as I move my cursor from left to right. I get these primary scopes.

• [ ...$rest ]
  • keyword.control.nushell
  • string.bare.nushell
• { ...$rest }
  • keyword.control.nushell
  • entity.name.type.external.nushell
  • variable.other.nushell

[fdncred]

Yup, I see it in Tinacious. You're right, tinacious is coloring more of the scopes.

[texastoland]

[ ...$rest ]
{ ...$rest }

From my minimal example here's the (unfixed) scopes I see:

	[]	{}
..	keyword.control.nushell	keyword.control.nushell
	meta.table.nushell	meta.expression.braced.nushell
	source.nushell	source.nushell
.$rest	string.bare.nushell	variable.other.nushell meta.command.nushell
	meta.table.nushell	meta.expression.braced.nushell
	source.nushell	source.nushell

It looks my patch would end up interpreting ... as an operator inside a closure instead of spreading a record. The alternative would be to include a new spread expression in each of the table and braced groups:

vscode-nushell-lang/syntaxes/nushell.tmLanguage.json

Lines 215 to 221 in bd9d19f

	"patterns": [
	{ "include": "#value" },
	{
	"match": ",",
	"name": "punctuation.separator.nushell"
	},
	{ "include": "#comment" }

vscode-nushell-lang/syntaxes/nushell.tmLanguage.json

Lines 516 to 565 in bd9d19f

	"patterns": [
	{
	"begin": "(?<=\\{)\\s*\\|",
	"end": "\\|",
	"name": "meta.closure.parameters.nushell",
	"patterns": [{ "include": "#function-parameter" }]
	},
	{
	"match": "(\\w+)\\s*(:)\\s*",
	"captures": {
	"1": { "name": "variable.other.nushell" },
	"2": { "name": "keyword.control.nushell" }
	}
	},
	{
	"match": "(\\$\"((?:[^\"\\\\]|\\\\.)*)\")\\s*(:)\\s*",
	"captures": {
	"1": { "name": "variable.other.nushell" },
	"2": { "name": "variable.other.nushell", "patterns": [{ "include": "#paren-expression" }] },
	"3": { "name": "keyword.control.nushell" }
	},
	"name": "meta.record-entry.nushell"
	},
	{
	"match": "(\"(?:[^\"\\\\]|\\\\.)*\")\\s*(:)\\s*",
	"captures": {
	"1": { "name": "variable.other.nushell" },
	"2": { "name": "keyword.control.nushell" }
	},
	"name": "meta.record-entry.nushell"
	},
	{
	"match": "(\\$'([^']*)')\\s*(:)\\s*",
	"captures": {
	"1": { "name": "variable.other.nushell" },
	"2": { "name": "variable.other.nushell", "patterns": [{ "include": "#paren-expression" }] },
	"3": { "name": "keyword.control.nushell" }
	},
	"name": "meta.record-entry.nushell"
	},
	{
	"match": "('[^']*')\\s*(:)\\s*",
	"captures": {
	"1": { "name": "variable.other.nushell" },
	"2": { "name": "keyword.control.nushell" }
	},
	"name": "meta.record-entry.nushell"
	},
	{ "include": "source.nushell" }
	]

[fdncred]

ya, I think we should have a new spread_expression to accomodate this new syntax.

[texastoland]

I'll PR tomorrow then and include a table with the new scopes 👌🏼