Skip to content
This repository was archived by the owner on Apr 24, 2021. It is now read-only.

Commit c3ad99c

Browse files
committed
Remove settings for codelenses.
1 parent 7f75579 commit c3ad99c

File tree

9 files changed

+15
-101
lines changed

9 files changed

+15
-101
lines changed

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// "reason_language_server.location": "./lib/bs/native/bin.native",
1010
"reason_language_server.location": "./bin.exe",
1111
// "reason_language_server.show_debug_errors": true,
12-
"reason_language_server.format_width": 100,
1312
// "reason_language_server.location": "./lib/bs/native/bin.native.exe",
1413
// "reason_language_server.reloadOnChange": true,
1514
"editor.tabSize": 2,

editor-extensions/coc.nvim/package.json

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,6 @@
5050
},
5151
"description": "Only specify this if build system autodetection isn't working for you (for example if you have a bsconfig.json, and a dune file in the same project). The keys in this object should be in uri format, e.g. file:///some/path/here"
5252
},
53-
"reason_language_server.format_width": {
54-
"type": "number",
55-
"default": 80,
56-
"description": "Format width (default=80)"
57-
},
58-
"reason_language_server.per_value_codelens": {
59-
"type": "boolean",
60-
"default": false,
61-
"description": "Show the type for each top-level value in a codelens"
62-
},
63-
"reason_language_server.dependencies_codelens": {
64-
"type": "boolean",
65-
"default": true,
66-
"description": "Show the dependencies for a file at the top"
67-
},
68-
"reason_language_server.opens_codelens": {
69-
"type": "boolean",
70-
"default": true,
71-
"description": "Indicate what values have been used from an open"
72-
},
73-
"reason_language_server.show_module_path_on_hover": {
74-
"type": "boolean",
75-
"default": true,
76-
"description": "Show the module path on hover"
77-
},
7853
"reason_language_server.reloadOnChange": {
7954
"type": "boolean",
8055
"default": false,

editor-extensions/vscode/Readme.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ Based on `vscode-reasonml`, but with a language server backend that's written en
2727
## Configuration
2828
all configuration is prefixed with `reason_language_server.`
2929

30-
- `.format_width` - defaults to 80
31-
- `.per_value_codelens` - show the type of each toplevel value in a lens
32-
- `.dependencies_codelens` - list a files dependencies at the top
33-
- `.opens_codelens` - show what values are used from an `open`
34-
3530
## Debugging configuration
3631
most useful if your developing the language server
3732

editor-extensions/vscode/package.json

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,6 @@
6262
"type": "string",
6363
"description": "Provide a location for an .ml/.mli formatter"
6464
},
65-
"reason_language_server.format_width": {
66-
"type": "number",
67-
"default": 80,
68-
"description": "Format width (default=80)"
69-
},
70-
"reason_language_server.per_value_codelens": {
71-
"type": "boolean",
72-
"default": false,
73-
"description": "Show the type for each top-level value in a codelens"
74-
},
75-
"reason_language_server.dependencies_codelens": {
76-
"type": "boolean",
77-
"default": true,
78-
"description": "Show the dependencies for a file at the top"
79-
},
80-
"reason_language_server.opens_codelens": {
81-
"type": "boolean",
82-
"default": true,
83-
"description": "Indicate what values have been used from an open"
84-
},
85-
"reason_language_server.show_module_path_on_hover": {
86-
"type": "boolean",
87-
"default": true,
88-
"description": "Show the module path on hover"
89-
},
9065
"reason_language_server.reloadOnChange": {
9166
"type": "boolean",
9267
"default": false,

examples/example-project/.vscode/settings.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@
22
"editor.codeLens": true,
33
"reason_language_server.location": "../../_build/install/default/bin/rescript-editor-support.exe",
44
"reason_language_server.reloadOnChange": true,
5-
"reason_language_server.per_value_codelens": true,
65
"reason_language_server.show_debug_errors": true,
7-
//"reason_language_server.show_module_path_on_hover": false
86
}

examples/example-project/src/B.re

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
3+
let x = 12
4+
5+
6+
let y = 44
7+
8+
9+
let z = 123

src/rescript-editor-support/MessageHandlers.re

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -233,26 +233,14 @@ let handlers:
233233
List.append(currentCl, getTypeLensTopLevel(tlp));
234234
};
235235
};
236-
let showToplevelTypes = state.settings.perValueCodelens; /* TODO config option */
237-
let lenses =
238-
showToplevelTypes
239-
? file.contents.topLevel |> getTypeLensTopLevel : [];
240-
let showOpens = state.settings.opensCodelens;
241-
let lenses =
242-
showOpens
243-
? lenses
244-
@ {
245-
CodeLens.forOpens(extra);
246-
}
247-
: lenses;
236+
let lenses = file.contents.topLevel |> getTypeLensTopLevel;
237+
let lenses = lenses @ CodeLens.forOpens(extra);
248238

249239
let depsList =
250240
List.map(fst, SharedTypes.hashList(extra.externalReferences));
251241
let depsString =
252242
depsList == [] ? "[none]" : String.concat(", ", depsList);
253-
let lenses =
254-
state.settings.dependenciesCodelens == true
255-
? [("Dependencies: " ++ depsString, topLoc), ...lenses] : lenses;
243+
let lenses = [("Dependencies: " ++ depsString, topLoc), ...lenses];
256244

257245
lenses;
258246
};

src/rescript-editor-support/NotificationHandlers.re

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,8 @@ let notificationHandlers:
6464
),
6565
(
6666
"workspace/didChangeConfiguration",
67-
(state, params) => {
68-
let settings =
69-
params |> Json.get("settings") |?> Json.get("reason_language_server");
70-
let perValueCodelens =
71-
settings |?> Json.get("per_value_codelens") |?> Json.bool |? false;
72-
let opensCodelens =
73-
settings |?> Json.get("opens_codelens") |?> Json.bool |? true;
74-
let dependenciesCodelens =
75-
settings |?> Json.get("dependencies_codelens") |?> Json.bool |? true;
76-
77-
Ok({
78-
...state,
79-
settings: {
80-
...state.settings,
81-
perValueCodelens,
82-
opensCodelens,
83-
dependenciesCodelens,
84-
},
85-
});
67+
(state, _params) => {
68+
Ok(state);
8669
},
8770
),
8871
(

src/rescript-editor-support/TopTypes.re

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ type package = {
1616
opens: list(string),
1717
};
1818

19-
type settings = {
20-
perValueCodelens: bool,
21-
opensCodelens: bool,
22-
dependenciesCodelens: bool,
23-
recordAllLocations: bool,
24-
};
19+
type settings = {recordAllLocations: bool};
2520

2621
type state = {
2722
rootUri: uri,
@@ -39,9 +34,6 @@ let empty = () => {
3934
rootForUri: Hashtbl.create(30),
4035
cmtCache: Hashtbl.create(30),
4136
settings: {
42-
perValueCodelens: false,
43-
opensCodelens: true,
44-
dependenciesCodelens: true,
4537
recordAllLocations: false,
4638
},
4739
};

0 commit comments

Comments
 (0)