Skip to content

Commit 14629f3

Browse files
Couple of fixes in Expecto integration
1 parent 636daa4 commit 14629f3

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

paket.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,10 +623,10 @@ GITHUB
623623
src/Helpers.fs (6eb3892d22f5c7c9bdc92cc85dee5e78c5c39277)
624624
GIT
625625
remote: https://github.com/Krzysztof-Cieslak/Neptune.git
626-
(618bb78a6ff6be55f5b0cf1393d3181096666902)
626+
(c408c31f718e63531841345e184dcf40f20c284e)
627627
build: build.cmd Publish
628628
os: windows
629-
(618bb78a6ff6be55f5b0cf1393d3181096666902)
629+
(c408c31f718e63531841345e184dcf40f20c284e)
630630
build: build.sh Publish
631631
os: mono
632632
remote: https://github.com/Krzysztof-Cieslak/Neptune-vstest.git

release/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"vscode": "^0.10.10"
2424
},
2525
"categories": [
26-
"Languages",
26+
"Programming Languages",
2727
"Other"
2828
],
2929
"activationEvents": [
@@ -60,7 +60,8 @@
6060
"outputChannels": [
6161
"Neptune (F# - Detector Service)",
6262
"Neptune (F# - VSTest Adapter)",
63-
"Neptune (F# - Classic Runners Adapter)"
63+
"Neptune (F# - Classic Runners Adapter)",
64+
"Neptune (F# - Expecto Adapter)"
6465
],
6566
"commands": [
6667
{

src/fsharp/ExpectoRunner.fs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open Ionide.VSCode.Helpers
88
open System.Text.RegularExpressions
99

1010
let private lastOutput = Collections.Generic.Dictionary<string,string>()
11-
let private outputChannel = Fable.Import.vscode.window.createOutputChannel "Expecto"
11+
let private outputChannel = Fable.Import.vscode.window.createOutputChannel "Neptune (F# - Expecto Adapter)"
1212

1313
let private trySkip count seq =
1414
let mutable index = 0
@@ -104,12 +104,14 @@ let getErrors () =
104104
else
105105
None
106106
)
107+
|> Seq.toArray
107108
errors
108109
|> Seq.map (fun (id, name) ->
109110
let error =
110111
output
111112
|> Seq.skip (id + 1)
112-
|> Seq.takeWhile (String.IsNullOrWhiteSpace >> not)
113+
|> Seq.takeWhile (fun n -> not (String.IsNullOrWhiteSpace n || n.StartsWith "[") )
114+
|> Seq.toArray
113115
let error =
114116
error
115117
|> Seq.take ((error |> Seq.length) - 1)

0 commit comments

Comments
 (0)