Skip to content

Commit

Permalink
FlexSpin semantic highlight correctly colde filenames on #include line (
Browse files Browse the repository at this point in the history 
#11)
  • Loading branch information
@ironsheep
ironsheep committed May 10, 2024
1 parent 60782ae commit ac32c3e
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 459 deletions.
1 change: 1 addition & 0 deletions spin2/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Update P2 Only

- BUGFIX: parsing repair detection of alignl/alignw in VAR. Issue(#9)
- BUGFIX: FlexSpin support: implement new understanding. #include is including spin code but no longer needs spin/spin2 file extension. Issue(#11)
- BUGFIX: FlexSpin support: fix highlighting for #include lines

## [2.2.16] 2024-04-14

Expand Down
260 changes: 31 additions & 229 deletions spin2/scripts/LIVE-package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,7 @@
"spinExtension.trace.server": {
"scope": "window",
"type": "string",
"enum": [
"off",
"messages",
"verbose"
],
"enum": ["off", "messages", "verbose"],
"default": "off",
"description": "Traces the communication between VSCode client and the spin2 language server."
},
Expand Down Expand Up @@ -151,11 +147,7 @@
"spinExtension.elasticTabstops.choice": {
"type": "string",
"default": "PropellerTool",
"enum": [
"PropellerTool",
"IronSheep",
"User1"
],
"enum": ["PropellerTool", "IronSheep", "User1"],
"description": "Select the set of Tabstops you wish to use."
},
"spinExtension.elasticTabstops.blocks.PropellerTool": {
Expand All @@ -169,78 +161,22 @@
},
"default": {
"con": {
"tabStops": [
2,
8,
16,
18,
32,
56,
78,
80
]
"tabStops": [2, 8, 16, 18, 32, 56, 78, 80]
},
"var": {
"tabStops": [
2,
8,
22,
32,
56,
80
]
"tabStops": [2, 8, 22, 32, 56, 80]
},
"obj": {
"tabStops": [
2,
8,
16,
18,
32,
56,
80
]
"tabStops": [2, 8, 16, 18, 32, 56, 80]
},
"pub": {
"tabStops": [
2,
4,
6,
8,
10,
12,
14,
16,
32,
56,
80
]
"tabStops": [2, 4, 6, 8, 10, 12, 14, 16, 32, 56, 80]
},
"pri": {
"tabStops": [
2,
4,
6,
8,
10,
12,
14,
16,
32,
56,
80
]
"tabStops": [2, 4, 6, 8, 10, 12, 14, 16, 32, 56, 80]
},
"dat": {
"tabStops": [
8,
14,
24,
32,
48,
56,
80
]
"tabStops": [8, 14, 24, 32, 48, 56, 80]
}
}
},
Expand All @@ -255,87 +191,22 @@
},
"default": {
"con": {
"tabStops": [
4,
8,
16,
20,
32,
44,
56,
68,
80
]
"tabStops": [4, 8, 16, 20, 32, 44, 56, 68, 80]
},
"var": {
"tabStops": [
4,
12,
24,
28,
32,
44,
56,
68,
80
]
"tabStops": [4, 12, 24, 28, 32, 44, 56, 68, 80]
},
"obj": {
"tabStops": [
4,
8,
16,
20,
32,
44,
56,
68,
80
]
"tabStops": [4, 8, 16, 20, 32, 44, 56, 68, 80]
},
"pub": {
"tabStops": [
4,
8,
12,
16,
20,
24,
28,
32,
56,
80
]
"tabStops": [4, 8, 12, 16, 20, 24, 28, 32, 56, 80]
},
"pri": {
"tabStops": [
4,
8,
12,
16,
20,
24,
28,
32,
56,
80
]
"tabStops": [4, 8, 12, 16, 20, 24, 28, 32, 56, 80]
},
"dat": {
"tabStops": [
4,
16,
20,
24,
28,
48,
52,
56,
60,
64,
68,
80
]
"tabStops": [4, 16, 20, 24, 28, 48, 52, 56, 60, 64, 68, 80]
}
}
},
Expand All @@ -350,80 +221,22 @@
},
"default": {
"con": {
"tabStops": [
2,
8,
16,
18,
32,
56,
76,
77,
78,
80
]
"tabStops": [2, 8, 16, 18, 32, 56, 76, 77, 78, 80]
},
"var": {
"tabStops": [
2,
8,
22,
32,
56,
80
]
"tabStops": [2, 8, 22, 32, 56, 80]
},
"obj": {
"tabStops": [
2,
8,
16,
18,
32,
56,
80
]
"tabStops": [2, 8, 16, 18, 32, 56, 80]
},
"pub": {
"tabStops": [
2,
4,
6,
8,
10,
12,
14,
16,
32,
56,
80
]
"tabStops": [2, 4, 6, 8, 10, 12, 14, 16, 32, 56, 80]
},
"pri": {
"tabStops": [
2,
4,
6,
8,
10,
12,
14,
16,
32,
56,
80
]
"tabStops": [2, 4, 6, 8, 10, 12, 14, 16, 32, 56, 80]
},
"dat": {
"tabStops": [
8,
14,
24,
32,
48,
56,
80
]
"tabStops": [8, 14, 24, 32, 48, 56, 80]
}
}
}
Expand Down Expand Up @@ -610,26 +423,14 @@
"languages": [
{
"id": "spin2",
"aliases": [
"spin2",
"Spin2",
"SPIN2"
],
"extensions": [
".spin2"
],
"aliases": ["spin2", "Spin2", "SPIN2"],
"extensions": [".spin2"],
"configuration": "./spin2.language-configuration.json"
},
{
"id": "spin",
"aliases": [
"spin",
"Spin",
"SPIN"
],
"extensions": [
".spin"
],
"aliases": ["spin", "Spin", "SPIN"],
"extensions": [".spin"],
"configuration": "./spin1.language-configuration.json"
}
],
Expand All @@ -654,6 +455,11 @@
"superType": "label",
"description": "user name for debug display"
},
{
"id": "filename",
"superType": "string",
"description": "A #included file"
},
{
"id": "setupParameter",
"superType": "parameter",
Expand Down Expand Up @@ -699,12 +505,8 @@
"semanticTokenScopes": [
{
"scopes": {
"returnValue": [
"meta.returntype.spin"
],
"storageType": [
"storage.type.pasm.spin2"
]
"returnValue": ["meta.returntype.spin"],
"storageType": ["storage.type.pasm.spin2"]
}
}
],
Expand Down
Loading

0 comments on commit ac32c3e

Please sign in to comment.