Skip to content

Commit 595bda0

Browse files
Fix startup
1 parent 6f2cf08 commit 595bda0

File tree

2 files changed

+20
-31
lines changed

2 files changed

+20
-31
lines changed

src/Components/Linter.fs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ module Linter =
4343
match prom with
4444
| Some p -> p
4545
|> LanguageService.project
46-
|> Promise.success (fun _ -> parse path (file.getText ()))
47-
|> ignore
48-
| None -> parse path (file.getText ()) |> ignore
46+
|> Promise.bind (fun _ -> parse path (file.getText ()))
47+
| None -> parse path (file.getText ())
48+
else
49+
Promise.lift (null |> unbox)
4950

5051

5152
let mutable private timer = None : NodeJS.Timer option
@@ -69,18 +70,9 @@ module Linter =
6970

7071
match window.Globals.visibleTextEditors |> Array.toList with
7172
| [] -> Promise.lift (null |> unbox)
72-
| [x] ->
73-
let path = x.document.fileName
74-
let content = x.document.getText()
75-
parse path content
73+
| [x] -> parseFile x.document
7674
| x::tail ->
77-
let path = x.document.fileName
78-
let content = x.document.getText()
79-
8075
tail
81-
|> List.fold (fun acc e ->
82-
let path = e.document.fileName
83-
let content = e.document.getText()
84-
acc |> Promise.bind(fun _ -> parse path content) )
85-
(parse path content)
76+
|> List.fold (fun acc e -> acc |> Promise.bind(fun _ -> parseFile e.document ) )
77+
(parseFile x.document )
8678
|> ignore

src/fsharp.fs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,19 @@ type FSharp() =
2121

2222
LanguageService.start ()
2323
Project.activate ()
24-
|> Promise.success (fun _ ->
25-
Linter.activate disposables
26-
Tooltip.activate df' disposables
27-
Autocomplete.activate df' disposables
28-
ParameterHints.activate df' disposables
29-
Definition.activate df' disposables
30-
Reference.activate df' disposables
31-
Symbols.activate df' disposables
32-
Highlights.activate df' disposables
33-
Rename.activate df' disposables
34-
Fsi.activate disposables
35-
QuickInfo.activate disposables
36-
FSharpFormatting.activate disposables
37-
WebPreview.activate disposables)
38-
|> ignore
39-
24+
Linter.activate disposables
25+
Tooltip.activate df' disposables
26+
Autocomplete.activate df' disposables
27+
ParameterHints.activate df' disposables
28+
Definition.activate df' disposables
29+
Reference.activate df' disposables
30+
Symbols.activate df' disposables
31+
Highlights.activate df' disposables
32+
Rename.activate df' disposables
33+
Fsi.activate disposables
34+
QuickInfo.activate disposables
35+
FSharpFormatting.activate disposables
36+
WebPreview.activate disposables
4037

4138
()
4239

0 commit comments

Comments
 (0)