Merge pull request #95 from ionide/hackForge

Krzysztof-Cieslak · web-flow · commit a31573bfc989 · 2016-07-14T13:58:43.000-07:00
Forge changes
diff --git a/build.fsx b/build.fsx
@@ -102,7 +102,6 @@ Target "CopyForge" (fun _ ->
     CleanDir releaseBinForge
 
     !! (forgeBin </> "Forge.exe" )
-    ++ (forgeBin </> "Mono.Posix.dll")
     |> CopyFiles releaseBinForge
 )
 
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,11 +1,11 @@
 source https://nuget.org/api/v2
 
 git https://github.com/ionide/ionide-vscode-helpers.git master build:"build.cmd", OS: windows
-git https://github.com/ionide/FsAutoComplete.git projectSymbols build:"build.cmd LocalRelease", OS: windows
+git https://github.com/ionide/FsAutoComplete.git master build:"build.cmd LocalRelease", OS: windows
 git https://github.com/fsprojects/Forge.git master build:"build.cmd", OS: windows
 
 git https://github.com/ionide/ionide-vscode-helpers.git master build:"build.sh", OS: mono
-git https://github.com/ionide/FsAutoComplete.git projectSymbols build:"build.sh LocalRelease", OS: mono
+git https://github.com/ionide/FsAutoComplete.git master build:"build.sh LocalRelease", OS: mono
 git https://github.com/fsprojects/Forge.git master build:"build.sh", OS: mono
 
 git git@github.com:ionide/ionide-fsgrammar.git
diff --git a/paket.lock b/paket.lock
@@ -1,6 +1,6 @@
 NUGET
   remote: https://www.nuget.org/api/v2
-    FAKE (4.29.2)
+    FAKE (4.31.1)
     Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
       Microsoft.Bcl.Build (>= 1.0.14)
     Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
@@ -21,24 +21,24 @@ GIT
       build: build.sh
       os: mono
   remote: https://github.com/ionide/FsAutoComplete.git
-     (810be5ada43482572575c16ba78f53e687ce8339)
+     (e8d2a88369ef166ded48d3a52cf2a0cff02b0372)
       build: build.cmd LocalRelease
       os: windows
-     (810be5ada43482572575c16ba78f53e687ce8339)
+     (e8d2a88369ef166ded48d3a52cf2a0cff02b0372)
       build: build.sh LocalRelease
       os: mono
   remote: https://github.com/fsprojects/Forge.git
-     (5a71633e50eec713046fdc2d5b2ba607f6debc12)
+     (22d2225486c5a50924442379e8a8b55145e2624d)
       build: build.cmd
       os: windows
-     (5a71633e50eec713046fdc2d5b2ba607f6debc12)
+     (22d2225486c5a50924442379e8a8b55145e2624d)
       build: build.sh
       os: mono
   remote: git@github.com:ionide/ionide-fsgrammar.git
      (c8fea8dc0a224a2ceb2371bc5e941157aca3de9e)
 GITHUB
   remote: fsharp/FAKE
-    modules/Octokit/Octokit.fsx (c56456abac6b744c3bb95b217687db19fd19b367)
+    modules/Octokit/Octokit.fsx (40dd0ff66fc379474450f93fd1ba545f6cf6c121)
       Octokit (>= 0.20)
   remote: Ionide/ionide-vscode-helpers
     Fable.Import.Axios.fs (777815f9c3f9b3925e42c6394c7f1f5fac124d6a)
diff --git a/release/.vscodeignore b/release/.vscodeignore
@@ -1 +1,2 @@
 .vscode/**
+templates
diff --git a/release/package.json b/release/package.json
@@ -153,7 +153,18 @@
         "command": "fsharp.MoveFileDown",
         "key": "ctrl+shift+down"
       }
-    ]
+    ],
+    "configuration": {
+        "type": "object",
+        "title": "FAKE configuration",
+        "properties": {
+            "FSharp.automaticProjectModification": {
+                "type": "boolean",
+                "default": false,
+                "description": "Automatically shows FAKE output panel"
+            }
+        }
+    }
   },
   "activationEvents": [
     "onLanguage:fsharp",
diff --git a/src/Components/Autocomplete.fs b/src/Components/Autocomplete.fs
@@ -28,15 +28,18 @@ module Autocomplete =
             | _   -> 0
 
         let mapCompletion (doc : TextDocument) (pos : Position) (o : CompletionResult) =
-            o.Data |> Array.map (fun c ->
-                let range = doc.getWordRangeAtPosition pos
-                let length = if JS.isDefined range then range.``end``.character - range.start.character else 0.
-                let result = createEmpty<CompletionItem>
-                result.kind <- c.GlyphChar |> convertToInt |> unbox
-                result.label <- c.Name
-                result.insertText <- c.ReplacementText
-                result)
-            |> ResizeArray
+            if o |> unbox <> null then
+                o.Data |> Array.map (fun c ->
+                    let range = doc.getWordRangeAtPosition pos
+                    let length = if JS.isDefined range then range.``end``.character - range.start.character else 0.
+                    let result = createEmpty<CompletionItem>
+                    result.kind <- c.GlyphChar |> convertToInt |> unbox
+                    result.label <- c.Name
+                    result.insertText <- c.ReplacementText
+                    result)
+                |> ResizeArray
+            else
+                ResizeArray ()
 
         let mapHelptext (sug : CompletionItem) (o : HelptextResult) =
             let res = (o.Data.Overloads |> Array.fold (fun acc n -> (n |> Array.toList) @ acc ) []).Head
diff --git a/src/Components/Definition.fs b/src/Components/Definition.fs
@@ -12,18 +12,20 @@ module Definition =
     let private createProvider () =
 
         let mapResult (doc : TextDocument) (pos : Position) (o : FindDeclarationResult) : Definition =
-            let loc = createEmpty<Location>
-            let range = doc.getWordRangeAtPosition pos
-            let length = range.``end``.character - range.start.character            
-            loc.uri <- Uri.file o.Data.File 
-            loc.range <- Range(float o.Data.Line - 1., float o.Data.Column - 1., float o.Data.Line - 1., float o.Data.Column + length  - 1.)
-            loc |> Case1
+            if o |> unbox <> null then
+                let loc = createEmpty<Location>
+                let range = doc.getWordRangeAtPosition pos
+                let length = range.``end``.character - range.start.character
+                loc.uri <- Uri.file o.Data.File
+                loc.range <- Range(float o.Data.Line - 1., float o.Data.Column - 1., float o.Data.Line - 1., float o.Data.Column + length  - 1.)
+                loc |> Case1
+            else
+                createEmpty<Location> |> Case1
 
-            
 
         { new DefinitionProvider
           with
-            member this.provideDefinition(doc, pos, ct) = 
+            member this.provideDefinition(doc, pos, ct) =
                 promise {
                     let! res = LanguageService.findDeclaration (doc.fileName) (int pos.line + 1) (int pos.character + 1)
                     return mapResult doc pos res
diff --git a/src/Components/Forge.fs b/src/Components/Forge.fs
@@ -56,8 +56,7 @@ module Forge =
             sprintf "move file -n %s -d" editor.document.fileName |> spawnForge |> ignore
 
     let refreshTemplates () =
-        let cp = "refresh" |> spawnForge
-        cp.on("exit", (fun _ ->  window.showInformationMessage "Templates refreshed") |> unbox )
+        "refresh" |> spawnForge |> ignore
 
     let addCurrentFileToProject () =
         let editor = vscode.window.activeTextEditor
@@ -139,8 +138,27 @@ module Forge =
 
     let newProject () =
         promise {
-            let! lst = "list templates" |> execForge
-            let n =  handleForgeList lst
+            //let! lst = "list templates" |> execForge
+            // let n =  handleForgeList lst
+            let n =
+                [
+                    "classlib"
+                    "console"
+                    "fslabbasic"
+                    "fslabjournal"
+                    "pcl259"
+                    "suave"
+                    "windows"
+                    "fsunit"
+                    "aspwebapi2"
+                    "websharperspa"
+                    "websharperserverclient"
+                    "websharpersuave"
+                    "servicefabrichost"
+                    "servicefabricsuavestateless"
+                ] |> ResizeArray
+
+
             if n.Count <> 0 then
                 let! template = window.showQuickPick ( n |> Case1)
                 if JS.isDefined template then
@@ -165,8 +183,9 @@ module Forge =
 
     let activate disposables =
         let watcher = workspace.createFileSystemWatcher ("**/*.fs")
-        watcher.onDidCreate $ (onFsFileCreateHandler, null, disposables) |> ignore
-        watcher.onDidDelete $ (onFsFileRemovedHandler, null, disposables) |> ignore
+        let cfg = workspace.getConfiguration ()
+        if cfg.get("FSharp.automaticProjectModification", false) then watcher.onDidCreate $ (onFsFileCreateHandler, null, disposables) |> ignore
+        if cfg.get("FSharp.automaticProjectModification", false) then watcher.onDidDelete $ (onFsFileRemovedHandler, null, disposables) |> ignore
         commands.registerCommand("fsharp.MoveFileUp", moveFileUp |> unbox) |> ignore
         commands.registerCommand("fsharp.MoveFileDown", moveFileDown |> unbox) |> ignore
         commands.registerCommand("fsharp.NewProject", newProject |> unbox) |> ignore
@@ -177,4 +196,6 @@ module Forge =
         commands.registerCommand("fsharp.RemoveProjectReference", removeProjectReference |> unbox) |> ignore
         commands.registerCommand("fsharp.AddReference", addReference |> unbox) |> ignore
         commands.registerCommand("fsharp.RemoveReference", removeReference |> unbox) |> ignore
+        refreshTemplates () |> ignore
+
         ()
diff --git a/src/Components/Highlights.fs b/src/Components/Highlights.fs
@@ -13,17 +13,20 @@ module Highlights =
     let private createProvider () =
 
         let mapResult (o : SymbolUseResult) =
-            o.Data.Uses |> Array.map (fun d ->
-                let res = createEmpty<DocumentHighlight>
-                res.range <- Range(float d.StartLine - 1., float d.StartColumn - 1., float d.EndLine - 1., float d.EndColumn - 1.)
-                res.kind <- (0 |> unbox)
-                res )
-            |> ResizeArray
-
-
-        { new DocumentHighlightProvider 
+            if o |> unbox <> null then
+                o.Data.Uses |> Array.map (fun d ->
+                    let res = createEmpty<DocumentHighlight>
+                    res.range <- Range(float d.StartLine - 1., float d.StartColumn - 1., float d.EndLine - 1., float d.EndColumn - 1.)
+                    res.kind <- (0 |> unbox)
+                    res )
+                |> ResizeArray
+            else
+                ResizeArray ()
+
+
+        { new DocumentHighlightProvider
           with
-            member this.provideDocumentHighlights(doc, pos, ct) = 
+            member this.provideDocumentHighlights(doc, pos, ct) =
                 promise {
                     let! res = LanguageService.symbolUse (doc.fileName) (int pos.line + 1) (int pos.character + 1)
                     return mapResult res
diff --git a/src/Components/Linter.fs b/src/Components/Linter.fs
@@ -86,11 +86,11 @@ module Linter =
         window.onDidChangeActiveTextEditor $ (handlerOpen, (), disposables) |> ignore
 
 
-        parseProject() |> ignore
         match window.visibleTextEditors |> Seq.toList with
         | [] -> Promise.lift (null |> unbox)
         | [x] -> parseFile x.document
         | x::tail ->
             tail
             |> List.fold (fun acc e -> acc |> Promise.bind(fun _ -> parseFile e.document ) )
                (parseFile x.document )
+        |> Promise.bind (parseProject)
diff --git a/src/Components/References.fs b/src/Components/References.fs
@@ -10,19 +10,22 @@ open DTO
 open Ionide.VSCode.Helpers
 
 module Reference =
-    let private createProvider () =    
+    let private createProvider () =
 
-        let mapResult (doc : TextDocument) (o : SymbolUseResult) =  
-            o.Data.Uses |> Array.map (fun s ->
-                let loc = createEmpty<Location> 
-                loc.range <-  Range(float s.StartLine - 1., float s.StartColumn - 1., float s.EndLine - 1., float s.EndColumn - 1.)
-                loc.uri <- Uri.file s.FileName
-                loc  )
-            |> ResizeArray
+        let mapResult (doc : TextDocument) (o : SymbolUseResult) =
+            if o |> unbox <> null then
+                o.Data.Uses |> Array.map (fun s ->
+                    let loc = createEmpty<Location>
+                    loc.range <-  Range(float s.StartLine - 1., float s.StartColumn - 1., float s.EndLine - 1., float s.EndColumn - 1.)
+                    loc.uri <- Uri.file s.FileName
+                    loc  )
+                |> ResizeArray
+            else
+                ResizeArray ()
 
-        { new ReferenceProvider 
-          with 
-            member this.provideReferences(doc, pos, _, _) = 
+        { new ReferenceProvider
+          with
+            member this.provideReferences(doc, pos, _, _) =
                 promise {
                     let! res = LanguageService.symbolUseProject (doc.fileName) (int pos.line + 1) (int pos.character + 1)
                     return mapResult doc res
diff --git a/src/Components/Rename.fs b/src/Components/Rename.fs
@@ -9,21 +9,21 @@ open Fable.Import.Node
 open DTO
 open Ionide.VSCode.Helpers
 
-module Rename = 
+module Rename =
     let private createProvider () =
-        let mapResult (doc : TextDocument) (newName : string) (o : SymbolUseResult) =  
-            let res = WorkspaceEdit ()           
-        
-            o.Data.Uses |> Array.iter (fun s ->
-                let range = Range(float s.StartLine - 1., (float s.EndColumn) - (float o.Data.Name.Length) - 1., float s.EndLine - 1., float s.EndColumn - 1.)
-                let te = TextEdit.replace(range, newName) 
-                let uri = Uri.file s.FileName
-                res.replace(uri,range, newName)) 
-            res 
+        let mapResult (doc : TextDocument) (newName : string) (o : SymbolUseResult) =
+            let res = WorkspaceEdit ()
+            if o |> unbox <> null then
+                o.Data.Uses |> Array.iter (fun s ->
+                    let range = Range(float s.StartLine - 1., (float s.EndColumn) - (float o.Data.Name.Length) - 1., float s.EndLine - 1., float s.EndColumn - 1.)
+                    let te = TextEdit.replace(range, newName)
+                    let uri = Uri.file s.FileName
+                    res.replace(uri,range, newName))
+            res
 
-        { new RenameProvider 
-          with 
-            member this.provideRenameEdits(doc, pos, newName, _ ) = 
+        { new RenameProvider
+          with
+            member this.provideRenameEdits(doc, pos, newName, _ ) =
                 promise {
                     let! res = LanguageService.symbolUseProject (doc.fileName) (int pos.line + 1) (int pos.character + 1)
                     return mapResult doc newName res
diff --git a/src/Components/Symbols.fs b/src/Components/Symbols.fs
@@ -26,35 +26,37 @@ module Symbols =
             | _   -> 0 |> unbox
 
         let mapRes (doc : TextDocument) o =
-             o.Data |> Array.map (fun syms ->
-                let oc = createEmpty<SymbolInformation>
-                oc.name <- syms.Declaration.Name
-                oc.kind <- syms.Declaration.GlyphChar |> convertToKind
-                oc.containerName <- syms.Declaration.Glyph
-                let loc = createEmpty<Location>
-                loc.range <-  Range
-                            ( float syms.Declaration.BodyRange.StartLine   - 1.,
-                                float syms.Declaration.BodyRange.StartColumn - 1.,
-                                float syms.Declaration.BodyRange.EndLine     - 1.,
-                                float syms.Declaration.BodyRange.EndColumn   - 1.)
-                loc.uri <- Uri.file doc.fileName
-                oc.location <- loc
-                let ocs =  syms.Nested |> Array.map (fun sym ->
+             if o |> unbox <> null then
+                o.Data |> Array.map (fun syms ->
                     let oc = createEmpty<SymbolInformation>
-                    oc.name <- sym.Name
-                    oc.kind <- sym.GlyphChar |> convertToKind
-                    oc.containerName <- sym.Glyph
+                    oc.name <- syms.Declaration.Name
+                    oc.kind <- syms.Declaration.GlyphChar |> convertToKind
+                    oc.containerName <- syms.Declaration.Glyph
                     let loc = createEmpty<Location>
                     loc.range <-  Range
-                                ( float sym.BodyRange.StartLine   - 1.,
-                                    float sym.BodyRange.StartColumn - 1.,
-                                    float sym.BodyRange.EndLine     - 1.,
-                                    float sym.BodyRange.EndColumn   - 1.)
+                                ( float syms.Declaration.BodyRange.StartLine   - 1.,
+                                    float syms.Declaration.BodyRange.StartColumn - 1.,
+                                    float syms.Declaration.BodyRange.EndLine     - 1.,
+                                    float syms.Declaration.BodyRange.EndColumn   - 1.)
                     loc.uri <- Uri.file doc.fileName
                     oc.location <- loc
-                    oc )
-                ocs |> Array.append (Array.create 1 oc)) |> Array.concat
-
+                    let ocs =  syms.Nested |> Array.map (fun sym ->
+                        let oc = createEmpty<SymbolInformation>
+                        oc.name <- sym.Name
+                        oc.kind <- sym.GlyphChar |> convertToKind
+                        oc.containerName <- sym.Glyph
+                        let loc = createEmpty<Location>
+                        loc.range <-  Range
+                                    ( float sym.BodyRange.StartLine   - 1.,
+                                        float sym.BodyRange.StartColumn - 1.,
+                                        float sym.BodyRange.EndLine     - 1.,
+                                        float sym.BodyRange.EndColumn   - 1.)
+                        loc.uri <- Uri.file doc.fileName
+                        oc.location <- loc
+                        oc )
+                    ocs |> Array.append (Array.create 1 oc)) |> Array.concat
+                else
+                    [||]
 
         { new DocumentSymbolProvider
           with
diff --git a/src/Components/Tooltip.fs b/src/Components/Tooltip.fs
diff --git a/src/Components/WorkspaceSymbols.fs b/src/Components/WorkspaceSymbols.fs
diff --git a/src/Ionide.FSharp.fsproj b/src/Ionide.FSharp.fsproj
diff --git a/src/fsharp.fs b/src/fsharp.fs

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ Target "CopyForge" (fun _ ->`
`102`	`102`	`CleanDir releaseBinForge`
`103`	`103`
`104`	`104`	`!! (forgeBin </> "Forge.exe" )`
`105`		`- ++ (forgeBin </> "Mono.Posix.dll")`
`106`	`105`	`\|> CopyFiles releaseBinForge`
`107`	`106`	`)`
`108`	`107`