Skip to content

Commit a1cf418

Browse files
ryyppyryyppy
authored
Merge pull request #28 from rescript-lang/upgrade-rescript-vscode-106
Upgrade rescript vscode 1.0.6
2 parents 504e500 + 1f1c937 commit a1cf418

15 files changed

Lines changed: 327 additions & 212 deletions

‎examples/basic/src/bar.res‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,19 @@ type what = A(string) | B(int)
4040

4141
let u = {name: "test"}
4242

43+
let labelTest = (~test: string) => {
44+
"Hello " ++ test
45+
}
46+
4347
module Test = {
4448
@react.component
45-
let make = () => {
49+
let make = (~name) => {
4650
let inputRef = React.useRef(Js.Nullable.null)
4751

4852
<div>
49-
<input ref={ReactDOM.Ref.domRef(inputRef)} /> <button> {React.string("Click me")} </button>
53+
<input ref={ReactDOM.Ref.domRef(inputRef)} /> <button> {React.string("Click me " ++ name)} </button>
5054
</div>
5155
}
5256
}
57+
58+
let callbackU = (. a) => Js.log(a)

‎rescript-vscode/[Content_Types].xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
3-
<Default Extension=".ts" ContentType="video/mp2t"/><Default Extension=".js" ContentType="application/javascript"/><Default Extension=".txt" ContentType="text/plain"/><Default Extension=".json" ContentType="application/json"/><Default Extension=".md" ContentType="text/markdown"/><Default Extension=".sh" ContentType="application/x-sh"/><Default Extension=".bnf" ContentType="application/octet-stream"/><Default Extension=".tsbuildinfo" ContentType="application/octet-stream"/><Default Extension=".png" ContentType="image/png"/><Default Extension=".exe" ContentType="application/octet-stream"/><Default Extension=".node" ContentType="application/octet-stream"/><Default Extension=".vsixmanifest" ContentType="text/xml"/>
3+
<Default Extension=".md" ContentType="text/markdown"/><Default Extension=".ts" ContentType="video/mp2t"/><Default Extension=".js" ContentType="application/javascript"/><Default Extension=".txt" ContentType="text/plain"/><Default Extension=".json" ContentType="application/json"/><Default Extension=".sh" ContentType="application/x-sh"/><Default Extension=".bnf" ContentType="application/octet-stream"/><Default Extension=".tsbuildinfo" ContentType="application/octet-stream"/><Default Extension=".png" ContentType="image/png"/><Default Extension=".exe" ContentType="application/octet-stream"/><Default Extension=".node" ContentType="application/octet-stream"/><Default Extension=".vsixmanifest" ContentType="text/xml"/>
44
</Types>

‎rescript-vscode/extension.vsixmanifest‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Language="en-US" Id="rescript-vscode" Version="1.0.4" Publisher="chenglou92"/>
4+
<Identity Language="en-US" Id="rescript-vscode" Version="1.0.6" Publisher="chenglou92"/>
55
<DisplayName>rescript-vscode</DisplayName>
66
<Description xml:space="preserve">The official VSCode plugin for ReScript.</Description>
77
<Tags>rescript,language-server,snippet,json,ReScript,__ext_res,__ext_resi</Tags>
8-
<Categories></Categories>
8+
<Categories>Programming Languages,Snippets,Linters,Formatters</Categories>
99
<GalleryFlags>Public</GalleryFlags>
1010
<Badges></Badges>
1111
<Properties>
@@ -39,6 +39,6 @@
3939
<Dependencies/>
4040
<Assets>
4141
<Asset Type="Microsoft.VisualStudio.Code.Manifest" Path="extension/package.json" Addressable="true" />
42-
<Asset Type="Microsoft.VisualStudio.Services.Content.Details" Path="extension/README.md" Addressable="true" /><Asset Type="Microsoft.VisualStudio.Services.Content.License" Path="extension/LICENSE.txt" Addressable="true" /><Asset Type="Microsoft.VisualStudio.Services.Icons.Default" Path="extension/logo.png" Addressable="true" />
42+
<Asset Type="Microsoft.VisualStudio.Services.Content.Details" Path="extension/README.md" Addressable="true" /><Asset Type="Microsoft.VisualStudio.Services.Content.Changelog" Path="extension/CHANGELOG.md" Addressable="true" /><Asset Type="Microsoft.VisualStudio.Services.Content.License" Path="extension/LICENSE.txt" Addressable="true" /><Asset Type="Microsoft.VisualStudio.Services.Icons.Default" Path="extension/logo.png" Addressable="true" />
4343
</Assets>
4444
</PackageManifest>

‎rescript-vscode/extension/CHANGELOG.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
## 1.0.6
2+
3+
Fixes:
4+
- Diagnostics crashing when a file's range isn't found (advice: use fewer ppxes that cause these bugs!). See [#77](https://github.com/rescript-lang/rescript-vscode/issues/77).
5+
- Weird behaviors when project path contains white space.
6+
- Proper audit of the windows bugs. Windows is now officially first-class!
7+
8+
Syntax colors:
9+
- Highlight operators for default VSCode dark+ theme. This means slightly less diverse highlight for the other themes that previously already highlighted operators.
10+
- Worked with [One Dark Pro](https://marketplace.visualstudio.com/items?itemName=zhuangtongfa.Material-theme) and [Mariana Pro](https://marketplace.visualstudio.com/items?itemName=rickynormandeau.mariana-pro). We now officially recommend these 2 themes, in addition to the existing recommendations in README.
11+
- Highlight deprecated elements using the deprecation scopes.
12+
- JSX bracket highlight fix (still no color; before, some parts were erroneously highlighted).
13+
14+
## 1.0.5
15+
16+
Features:
17+
- Custom folding. See README.
18+
- Support for doc strings when hovering on modules.
19+
- Jump to type definition for types defined in inner modules.
20+
21+
Fixes:
22+
- Properly highlight nested comments.
23+
- Windows diagnostics!
24+
- Removed a potential infinite loop issue in autocomplete.
25+
- Don't autocomplete `open MyModule` inside line comments.
26+
- Don't print parentheses as in `A()` for 0-ary variants.
27+
28+
## 1.0.4
29+
30+
- Some diagnostics watcher staleness fix.
31+
- Various type hover fixes.
32+
- Monorepo/yarn workspace support.
33+
34+
## 1.0.2
35+
36+
- All the usual features (type hint, autocomplete) now work on `bsconfig.json` too!
37+
- Snippets, to ease a few syntaxes.
38+
- Improved highlighting for polymorphic variants. Don't abuse them please.
39+
40+
## 1.0.1
41+
42+
- Fix temp file creation logic.
43+
44+
## 1.0.0
45+
46+
Official first release!

‎rescript-vscode/extension/HISTORY.md‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎rescript-vscode/extension/README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,23 @@ The official VSCode plugin for ReScript.
88

99
You **must** have `bs-platform 8.3.3` installed locally in your project, through the usual [npm installation](https://rescript-lang.org/docs/manual/latest/installation#integrate-into-existing-js-project). Older versions are not guaranteed to work.
1010

11+
## Recommendation
12+
13+
Our highlighting works well with most popular VSCode themes, such as:
14+
15+
- Dark+ (default dark), Light+ (default light)
16+
- Solarized Dark, Solarized Light
17+
- Monokai Dimmed
18+
- Tomorrow Night Blue
19+
- [One Dark Pro](https://marketplace.visualstudio.com/items?itemName=zhuangtongfa.Material-theme)
20+
- [Mariana Pro](https://marketplace.visualstudio.com/items?itemName=rickynormandeau.mariana-pro)
21+
22+
The only 2 themes we don't (and can't) support, due to their lack of coloring, are:
23+
24+
- Dark (Visual Studio), Light (Visual Studio)
25+
26+
If your custom theme doesn't seem to highlight much (e.g. no colors for upper-case JSX tag, no distinction between module and variant), try one of the recommended themes to see if that's the problem. For more info, see [this post](https://github.com/rescript-lang/rescript-vscode/pull/8#issuecomment-764469070).
27+
1128
## Installation
1229

1330
The plugin's on [VSCode Marketplace](https://marketplace.visualstudio.com/items?itemName=chenglou92.rescript-vscode). In VSCode, `cmd-shift-p` -> "Install Extensions", then find "rescript-vscode".
@@ -29,6 +46,7 @@ The plugin activates on `.res` and `.resi` files. If you've already got Reason-L
2946
- Snippets to ease a few syntaxes:
3047
- `external` features such as `@bs.module` and `@bs.val`
3148
- `try`, `for`, etc.
49+
- Folding, and [custom folding](https://code.visualstudio.com/docs/editor/codebasics#_folding) through `//#region` and `//#endregion`.
3250

3351
### Upcoming Features
3452

‎rescript-vscode/extension/grammars/rescript.tmLanguage.json‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828
"commentBlock": {
2929
"name": "comment.block",
3030
"begin": "/\\*",
31-
"end": "\\*/"
31+
"end": "\\*/",
32+
"patterns": [
33+
{
34+
"include": "#commentBlock"
35+
}
36+
]
3237
},
3338
"punctuations": {
3439
"patterns": [
@@ -194,16 +199,12 @@
194199
"operator": {
195200
"patterns": [
196201
{
197-
"match": "->|\\|\\||&&|\\+\\+|\\*\\*|\\+\\.|\\+|-\\.|-|\\*\\.|\\*|/\\.|/|\\.\\.\\.|\\.\\.|\\|>|===|==|\\^|:=|!|>=(?! *\\?)|<=",
198-
"name": "keyword.operator"
199-
}
200-
]
201-
},
202-
"assignment": {
203-
"patterns": [
202+
"match": "->|\\|\\||&&|\\+\\+|\\*\\*|\\+\\.|\\+|-\\.|-|\\*\\.|\\*|/\\.|/|\\.\\.\\.|\\.\\.|===|==|\\^|:=|!|>=(?! *\\?)|<=|=",
203+
"name": "keyword.operator keyword"
204+
},
204205
{
205-
"match": "=",
206-
"name": "keyword.operator.assignment"
206+
"match": "\\|>",
207+
"name": "invalid.deprecated"
207208
}
208209
]
209210
},
@@ -279,12 +280,26 @@
279280
"attribute": {
280281
"patterns": [
281282
{
282-
"match": "(@@?)([A-Za-z_][A-Za-z0-9_\\.]*)",
283+
"match": "(@)(splice)",
284+
"captures": {
285+
"1": {
286+
"name": "storage.modifier punctuation.definition.annotation"
287+
},
288+
"2": {
289+
"name": "invalid.illegal"
290+
}
291+
}
292+
},
293+
{
294+
"match": "(@@?)(bs\\.)?([A-Za-z_][A-Za-z0-9_\\.]*)",
283295
"captures": {
284296
"1": {
285297
"name": "storage.modifier punctuation.definition.annotation"
286298
},
287299
"2": {
300+
"name": "invalid.deprecated"
301+
},
302+
"3": {
288303
"name": "variable.annotation"
289304
}
290305
}
@@ -316,7 +331,7 @@
316331
}
317332
},
318333
{
319-
"match": "</([A-Z_][0-9a-zA-Z_]*)"
334+
"match": "</([a-z_][0-9a-zA-Z_]*)"
320335
},
321336
{
322337
"match": "<([A-Z_][0-9a-zA-Z_]*)",
@@ -457,9 +472,6 @@
457472
{
458473
"include": "#operator"
459474
},
460-
{
461-
"include": "#assignment"
462-
},
463475
{
464476
"include": "#number"
465477
},

‎rescript-vscode/extension/package.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
"description": "The official VSCode plugin for ReScript.",
44
"author": "chenglou",
55
"license": "MIT",
6-
"version": "1.0.4",
6+
"version": "1.0.6",
77
"repository": {
88
"type": "git",
99
"url": "https://github.com/rescript-lang/rescript-vscode"
1010
},
1111
"publisher": "chenglou92",
1212
"icon": "logo.png",
13-
"categories": [],
13+
"categories": [
14+
"Programming Languages",
15+
"Snippets",
16+
"Linters",
17+
"Formatters"
18+
],
1419
"keywords": [
1520
"rescript",
1621
"language-server"

‎rescript-vscode/extension/rescript.configuration.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@
6565
]
6666
],
6767
"folding": {
68-
"offSide": true
68+
"markers": {
69+
"start": "^\\s*//\\s*#?region\\b",
70+
"end": "^\\s*//\\s*#?endregion\\b"
71+
}
6972
}
7073
}

‎rescript-vscode/extension/server/darwin/rescript-editor-support.exe‎

4.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)