Error Panel using F#

Author: Krzysztof-Cieslak

.gitignore

@@ -34,3 +34,4 @@ Test/bin/
 packages
 paket.lock
 Test/Script.fsx
+Test/Script.fsx

build.fsx

@@ -76,26 +76,18 @@ let translateModules() =
     let moduleJS = 
       [ yield "var CompositeDisposable = require('atom').CompositeDisposable;"
         yield "var child_process = require('child_process');"
+        yield "window.$ = require('jquery');"
         yield ""
         yield "function wrappedFunScript() { \n" + coreJS + "\n }"
         yield "var _funcs = wrappedFunScript();"
         yield "var _self = _funcs[0]();"
         yield ""
-        yield "var provider = {" 
-        yield "selector: '.source.fsharp',"
-        yield "inclusionPriority: 1,"
-        yield "excludeLowerPriority: true,"
-        yield "getSuggestions: function(p1) {"
-        yield "return _funcs[1](_self)(p1); }"
-        yield "};"
         yield "module.exports = " + moduleName + " = {"
-        yield "provide: function() {"
-        yield "return provider; },"
-        for i, m in Seq.zip [1 .. meths.Length] meths.[1 ..] do
+        for i, m in Seq.zip [1 .. meths.Length] meths do
           let parNames = String.concat "" [ for j in 1 .. m.GetParameters().Length -> sprintf "p%i" j ]
           let parArgs = String.concat "" [ for j in 1 .. m.GetParameters().Length -> sprintf "(p%i)" j ]
           yield m.Name + ": function(" + parNames + ") {"
-          yield "  return _funcs[" + string (i+1) + "](_self)" + parArgs + "; }" +
+          yield "  return _funcs[" + string i + "](_self)" + parArgs + "; }" +
                  ( if i = meths.Length then "" else "," )
         yield "};" ]
       |> String.concat "\n"

src/atom-bindings.fsx

@@ -101,4 +101,21 @@ module Promise =
         let getRow (o: Options) : int = failwith "JS"
 
         [<JSEmitInline("{0}.prefix")>]
-        let getPrefix (o : Options) : string = failwith "JS"
+        let getPrefix (o : Options) : string = failwith "JS"
+
+module Workspace = 
+    type Options = {item : obj; visible : bool; priority : int}
+
+    type Panel = class end
+
+    [<JSEmitInline("atom.workspace.addBottomPanel({0})")>]
+    let addBotomPanel(o : Options) : Panel = failwith "JS"
+
+    [<JSEmitInline("{0}.hide()")>]
+    let hidePanel(p : Panel) : unit = failwith "JS"
+
+    [<JSEmitInline("{0}.show()")>]
+    let showPanel(p : Panel) : unit = failwith "JS"
+
+
+

src/autocomplete-fs/lib/autocomplete-fs.js

@@ -12,6 +12,7 @@
     "atom": ">=0.174.0 <2.0.0"
   },
   "dependencies": {
+    "jquery": "2.1.3"
   },
   "providedServices": {
   "autocomplete.provider": {

src/autocomplete-fs/package.json

@@ -6,3 +6,53 @@
 
 .autocomplete-fs {
 }
+
+.border-flip (@a) when (lightness(@a) >= 50%) {
+  border: 1px solid darken(@tool-panel-background-color, 30%);
+}
+.border-flip (@a) when (lightness(@a) < 50%) {
+  border: 1px solid lighten(@tool-panel-background-color, 20%);
+}
+
+.error-pane {
+  overflow-y: scroll;
+  height:150px;
+  position:relative;
+  .error-table {
+    width:100%;
+    line-height: 1.42;
+    th {
+      .border-flip(@tool-panel-background-color);
+      border-top: 1px solid transparent;
+      padding:2px;
+      padding-top:0px;
+    }
+    tr.selected {
+      background-color: @background-color-selected;
+    }
+    tr:hover {
+      background-color: @background-color-selected;
+      color: @text-color-selected;
+      cursor:pointer;
+    }
+    td {
+    }
+  }
+
+  pre {
+    background: #161719;
+    font-size: 10px;
+    margin: 0px;
+    padding: 0px;
+    border:none;
+  }
+  .pending {
+    color: @text-color-warning;
+  }
+  .success {
+    color: @text-color-success;
+  }
+  .fail {
+    color: @text-color-error;
+  }
+}

src/autocomplete-fs/styles/autocomplete-fs.less

@@ -14,7 +14,23 @@ open Atom.Promise
 
 module AutocompleteResults = 
     type CompletionResult = {Kind : string; Data : string []}
-    type ParseResult = {Kind : string; Data : string []}
+    
+
+    type Error = {
+        StartLine : int 
+        StartLineAlternate : int
+        StartColumn : int
+        StartColumnAlternate : int
+        EndLine : int 
+        EndLineAlternate : int
+        EndColumn : int
+        EndColumnAlternate : int
+        Message : string
+        Severity : string
+        Subcategory : string
+        }
+
+    type ParseResult = {Kind : string; Data : Error []}
 
 module AutocompleteService = 
     type State = 
@@ -109,6 +125,11 @@ module AutocompleteHandler =
         service |> AutocompleteService.ask str 1 cb
 
 module AutocompleteProvider = 
+    
+    type Provider = {selector : string; inclusionPriority : int; excludeLowerPriority: bool; getSuggestions : Options.Options -> Promise  }
+    
+
+
     let getSuggestion service options =
         let path = options |> Atom.Promise.Options.getPath
         let row = (options |> Atom.Promise.Options.getRow) + 1
@@ -134,13 +155,14 @@ module AutocompleteProvider =
                     | ex -> Atom.Promise.resolve [||]
             service |> AutocompleteHandler.parseCurrent (fun _ -> service |> AutocompleteHandler.completion path row col action |> ignore) |> ignore)
 
+
+    let create service = { selector = ".source.fsharp"; inclusionPriority = 1; excludeLowerPriority = true; getSuggestions = getSuggestion service}
+
 module HighlighterHandler = 
     let mutable marked = Array.empty<Marker>
 
     let handle lst = 
-        //iter(marked, destroyMarker)
-        //NOT WORKING
-        marked |> Array.iter(fun i -> i|> destroyMarker)
+        marked |> Array.iter(destroyMarker)
         marked <- Array.empty<Marker>
         let editor = getActiveTextEditor()
         let action item = 
@@ -149,24 +171,58 @@ module HighlighterHandler =
             let cls = if getItemSeverity(item) = "Warning" then "highlight-warning" else "highlight-error"
             marked <- Array.append [|marker|] marked
             decorateMarker(editor, marker, cls)
-        iter(lst, action)
+        lst |> Array.iter(action)
         ()
-        //NOT WORKING
-        //lst |> List.iter(action)
 
+module Views = 
+    let jq(selector : string) = Globals.Dollar.Invoke selector
+    let (?) jq name = jq("#" + name)
+    
+    module ErrorRowView = 
+        let create (e : AutocompleteResults.Error) = 
+            sprintf "<tr><td>%d : %d</td><td>%s</td><td>%s</td><td>%s</td></tr>" 
+                e.StartLineAlternate
+                e.StartColumn
+                e.Message
+                e.Severity
+                e.Subcategory
+            |> jq
+
+
+    module ErrorPanelView = 
+        let handle lst = 
+            let list = jq("#errorList")
+            list.children().remove() |> ignore
+            lst |> Array.iter(fun e -> let t = e |> ErrorRowView.create 
+                                       let r = t |> list.append 
+                                       ())
+
+        let create () =
+            "<div class='tool-panel panel-bottom error-pane' id='pane'><div class='inset-panel'><div class='panel-heading clearfix'>Errors</div><table class='error-table'><thead><th>Position</th><th>Message</th><th>Type</th><th>Category</th></thead><tbody id='errorList'></table></div></div>"
+            |> jq
+
+        let hadnleEditorChange panel editor = 
+            if editor |> getEditorGrammarName = "F#" then Workspace.showPanel panel else Workspace.hidePanel panel
 
 type Autocomplete() = 
     let cd = CompositeDisposable.create()        
     let service = AutocompleteService.create
                   |> AutocompleteService.start
                   |> AutocompleteService.send "outputmode json\n"   
-    
-    member x.getSuggestion(options : Atom.Promise.Options.Options) = 
-        AutocompleteProvider.getSuggestion service options
+
+    let panel = 
+        let t = Views.ErrorPanelView.create () 
+        Workspace.addBotomPanel {Workspace.item = t; Workspace.priority = 100; Workspace.visible = false}
+
+    member x.provide ()= 
+        AutocompleteProvider.create service
 
     member x.activate(state:obj) =     
         onDidChangeActivePaneItem (fun ed -> AutocompleteHandler.parseEditor ed (fun _ -> ()) service |> ignore)
+        onDidChangeActivePaneItem (Views.ErrorPanelView.hadnleEditorChange panel)
         on("FSharp.Atom:Highlight", HighlighterHandler.handle)
+        on("FSharp.Atom:Highlight", Views.ErrorPanelView.handle)
+        ()
 
     member x.deactivate() = 
         CompositeDisposable.dispose(cd)