Solution explorer: Compile order and better support for directories (#1472)

* Add virtual path to file

* Duplicate folders to build compile order

Slightl syntax

* Update file actions

* Update prompt text to match new path behaviour

* Remove commented code

Author: tboby

src/Components/SolutionExplorer.fs

@@ -28,34 +28,35 @@ module SolutionExplorer =
         | ProjectLanguageNotSupported of parent : Model option ref * path : string * name : string
         | Project of parent : Model option ref * path : string * name : string * Files : Model list * ProjectReferencesList : Model  * ReferenceList : Model * isExe : bool * project : DTO.Project
         | Folder of parent : Model option ref * name : string * path : string * Files : Model list * projectPath : string
-        | File of parent : Model option ref * path : string * name : string * projectPath : string
+        | File of parent : Model option ref * path : string * name : string * virtualPath : string option * projectPath : string
         | PackageReference of parent : Model option ref * path : string * name : string * projectPath : string
         | ProjectReference of parent : Model option ref * path : string * name : string * projectPath : string
 
     type NodeEntry =
         { Key : string
           FilePath: string
-          Children : Dictionary<string, NodeEntry> }
+          VirtualPath : string
+          mutable Children : NodeEntry list }
 
     let inline pathCombine a b =
         a + node.path.sep + b
 
     let add' root (virtualPath: string) filepath =
         let rec addhelper state items =
-            match items with
-            | [ ] -> state
-            | [ key ] ->
-                if not (state.Children.ContainsKey key) then
-                    let x = { Key = key; FilePath = filepath; Children = new Dictionary<_,_>() }
-                    state.Children.Add(key,x)
+            match items, state.Children with
+            | [ ], _ -> state
+            | [ key ], children when children |> List.exists (fun c -> c.Key = key) -> state
+            | [ key ], _ ->
+                let x = { Key = key; FilePath = filepath; VirtualPath = virtualPath; Children = [] }
+                state.Children <- x :: state.Children
                 state
-            | dirName :: xs ->
-                if not (state.Children.ContainsKey dirName) then
-                    let dirPath = pathCombine state.FilePath dirName
-                    let x = { Key = dirName; FilePath = dirPath; Children = new Dictionary<_,_>() }
-                    state.Children.Add(dirName,x)
-                let item = state.Children.[dirName]
-                addhelper item xs
+            | dirName :: xs, lastFileOrDir :: _ when dirName = lastFileOrDir.Key ->
+                addhelper lastFileOrDir xs
+            | dirName :: xs, _ ->
+                let dirPath = pathCombine state.FilePath dirName
+                let x = { Key = dirName; FilePath = dirPath; VirtualPath = virtualPath; Children = [] }
+                state.Children <- x :: state.Children
+                addhelper x xs
 
         virtualPath.Split('/')
         |> List.ofArray
@@ -77,7 +78,7 @@ module SolutionExplorer =
         | ProjectLanguageNotSupported (parent, _, _) -> parent
         | Project (parent, _, _, _, _, _, _, _) -> parent
         | Folder (parent, _, _, _, _) -> parent
-        | File (parent, _, _, _) -> parent
+        | File (parent, _, _, _, _) -> parent
         | PackageReference (parent, _, _, _) -> parent
         | ProjectReference (parent, _, _, _) -> parent
 
@@ -104,23 +105,24 @@ module SolutionExplorer =
 *)
 
     let rec toModel (projPath: string) (entry : NodeEntry)  =
-        if entry.Children.Count > 0 then
+        if entry.Children.Length > 0 then
             let childs =
                 entry.Children
-                |> Seq.map (fun n -> toModel projPath n.Value)
+                |> Seq.map (toModel projPath)
                 |> Seq.toList
             let result = Folder(ref None, entry.Key, entry.FilePath, childs, projPath)
             setParentRefs childs result
             result
         else
-            File(ref None, entry.FilePath, entry.Key, projPath)
+            File(ref None, entry.FilePath, entry.Key, Some entry.VirtualPath, projPath)
 
     let buildTree projPath (files : (string * string) list) =
         let projDir = dirName projPath
-        let entry = {Key = ""; FilePath = projDir; Children = new Dictionary<_,_>()}
+        let entry = {Key = ""; FilePath = projDir; VirtualPath = ""; Children = []}
         files |> List.iter (fun (virtualPath, path) -> add' entry virtualPath path)
         entry.Children
-        |> Seq.map (fun n -> toModel projPath n.Value )
+        |> Seq.rev
+        |> Seq.map (toModel projPath)
         |> Seq.toList
 
     let private getProjectModel (proj: Project) =
@@ -206,7 +208,7 @@ module SolutionExplorer =
             | WorkspacePeekFoundSolutionItemKind.Folder folder ->
                 let files =
                     folder.Files
-                    |> Array.map (fun f -> Model.File (ref None, f,node.path.basename(f),""))
+                    |> Array.map (fun f -> Model.File (ref None, f,node.path.basename(f), None, ""))
                 let items = folder.Items |> Array.map getItem
                 let result = Model.WorkspaceFolder (ref None, item.Name, (Seq.append files items |> List.ofSeq))
                 setParentRefs files result
@@ -250,7 +252,7 @@ module SolutionExplorer =
             ]
         | PackageReferenceList (_, refs, _) -> refs
         | ProjectReferencesList (_, refs, _) -> refs
-        | Folder (_, _,_,files, _) -> files
+        | Folder (_, _,_,files, _) -> files |> List.rev
         | File _ -> []
         | PackageReference _ -> []
         | ProjectReference _ -> []
@@ -269,7 +271,7 @@ module SolutionExplorer =
         | PackageReferenceList _ -> "Package References"
         | ProjectReferencesList (_, refs, _) -> "Project References"
         | Folder (_, n,_, _, _) -> n
-        | File (_, _, name, _) -> name
+        | File (_, _, name, _, _) -> name
         | PackageReference (_, _, name, _) ->
             if name.ToLowerInvariant().EndsWith(".dll") then
                 name.Substring(0, name.Length - 4)
@@ -335,7 +337,7 @@ module SolutionExplorer =
 
                 let command =
                     match node with
-                    | File (_, p, _, _) ->
+                    | File (_, p, _, _, _) ->
                         let c = createEmpty<Command>
                         c.command <- "vscode.open"
                         c.title <- "open"
@@ -371,7 +373,7 @@ module SolutionExplorer =
 
                 let icon, resourceUri =
                     match node with
-                    | File (_, path, _, _)
+                    | File (_, path, _, _, _)
                     | Project (_, path, _, _, _, _, _, _)
                     | ProjectNotLoaded (_, path, _)
                     | ProjectLoading (_, path, _)
@@ -398,7 +400,9 @@ module SolutionExplorer =
                     match node with
                     | PackageReferenceList (_, _, pp) | ProjectReferencesList (_, _,pp) | PackageReference (_, _, _, pp) | ProjectReference (_, _, _, pp)  ->
                         Some ((defaultArg ti.label "") + "||" + pp)
-                    | Folder (_, _,_, _, pp) | File (_, _, _, pp) ->
+                    | Folder _ ->
+                        None
+                    | File (_, _, _, _, pp) ->
                         (resourceUri |> Option.map(fun u -> (defaultArg ti.label "") + "||" + u.toString() + "||" + pp))
                     | _ ->
                         (resourceUri |> Option.map(fun u -> (defaultArg ti.label "") + "||" + u.toString()))
@@ -463,7 +467,7 @@ module SolutionExplorer =
 
         let rec private getModelPerFile (model : Model) : (string * Model) list =
             match model with
-            | File (_, path, _, _)
+            | File (_, path, _, _, _)
             | ProjectNotLoaded (_, path, _)
             | ProjectLoading (_, path, _)
             | ProjectFailedToLoad (_, path, _, _)
@@ -581,35 +585,35 @@ module SolutionExplorer =
 
         commands.registerCommand("fsharp.explorer.moveUp", objfy2 (fun m ->
             match unbox m with
-            | File (_, _, name, proj) -> FsProjEdit.moveFileUpPath proj name
+            | File (_, _, name, Some virtPath, proj) -> FsProjEdit.moveFileUpPath proj virtPath
             | _ -> undefined
         )) |> context.subscriptions.Add
 
         commands.registerCommand("fsharp.explorer.moveDown", objfy2 (fun m ->
             match unbox m with
-            | File (_, _, name, proj) -> FsProjEdit.moveFileDownPath proj name
+            | File (_, _, name, Some virtPath, proj) -> FsProjEdit.moveFileDownPath proj virtPath
             | _ -> undefined
         )) |> context.subscriptions.Add
 
         commands.registerCommand("fsharp.explorer.removeFile", objfy2 (fun m ->
             match unbox m with
-            | File (_, _, name, proj) -> FsProjEdit.removeFilePath proj name
+            | File (_, _, name, Some virtPath, proj) -> FsProjEdit.removeFilePath proj virtPath
             | _ -> undefined
         )) |> context.subscriptions.Add
 
 
         commands.registerCommand("fsharp.explorer.addAbove", objfy2 (fun m ->
             match unbox m with
-            | File (_, _, name, proj) ->
+            | File (_, _, name, Some virtPath, proj) ->
                 let opts = createEmpty<InputBoxOptions>
                 opts.placeHolder <- Some "new.fs"
-                opts.prompt <- Some "New file name, relative to project file"
+                opts.prompt <- Some "New file name, relative to selected file"
                 opts.value <- Some "new.fs"
                 window.showInputBox(opts)
                 |> Promise.bind (fun file ->
                     if JS.isDefined file then
                         let file' = handleUntitled file
-                        FsProjEdit.addFileAbove proj name file'
+                        FsProjEdit.addFileAbove proj virtPath file'
                     else
                         Promise.empty
                 )
@@ -619,16 +623,16 @@ module SolutionExplorer =
 
         commands.registerCommand("fsharp.explorer.addBelow", objfy2 (fun m ->
             match unbox m with
-            | File (_, fr_om, name, proj) ->
+            | File (_, fr_om, name, Some virtPath, proj) ->
                 let opts = createEmpty<InputBoxOptions>
                 opts.placeHolder <- Some "new.fs"
-                opts.prompt <- Some "New file name, relative to project file"
+                opts.prompt <- Some "New file name, relative to selected file"
                 opts.value <- Some "new.fs"
                 window.showInputBox(opts)
                 |> Promise.map (fun file ->
                     if JS.isDefined file then
                         let file' = handleUntitled file
-                        FsProjEdit.addFileBelow proj name file'
+                        FsProjEdit.addFileBelow proj virtPath file'
                     else
                         Promise.empty
                 )
@@ -641,7 +645,7 @@ module SolutionExplorer =
             | Project (_, proj, _, _,_,_,_,_) ->
                 let opts = createEmpty<InputBoxOptions>
                 opts.placeHolder <- Some "new.fs"
-                opts.prompt <- Some "New file name, relative to opened directory"
+                opts.prompt <- Some "New file name, relative to project file"
                 opts.value <- Some "new.fs"
                 window.showInputBox(opts)
                 |> Promise.map (fun file ->

src/Core/DTO.fs

@@ -427,9 +427,9 @@ module DTO =
     module FsProj =
         type DotnetProjectRequest = { Target: string; Reference: string }
 
-        type DotnetFileRequest = { FsProj: string; File: string }
+        type DotnetFileRequest = { FsProj: string; FileVirtualPath: string }
 
-        type DotnetFile2Request = { FsProj: string; File: string; NewFile: string }
+        type DotnetFile2Request = { FsProj: string; FileVirtualPath: string; NewFile: string }
 
     module FakeSupport =
         type FakeContext =

src/Core/LanguageService.fs

@@ -294,7 +294,7 @@ module LanguageService =
         | Some cl ->
             let req : FsProj.DotnetFileRequest  = {
                 FsProj = fsproj
-                File = file
+                FileVirtualPath = file
             }
             printfn "TEST8 %A" req
 
@@ -309,7 +309,7 @@ module LanguageService =
         | Some cl ->
             let req : FsProj.DotnetFileRequest  = {
                 FsProj = fsproj
-                File = file
+                FileVirtualPath = file
             }
 
             cl.sendRequest("fsproj/moveFileDown", req)
@@ -323,7 +323,7 @@ module LanguageService =
         | Some cl ->
             let req : FsProj.DotnetFile2Request   = {
                 FsProj = fsproj
-                File = file
+                FileVirtualPath = file
                 NewFile = newFile
             }
 
@@ -338,7 +338,7 @@ module LanguageService =
         | Some cl ->
             let req : FsProj.DotnetFile2Request   = {
                 FsProj = fsproj
-                File = file
+                FileVirtualPath = file
                 NewFile = newFile
             }
 
@@ -353,7 +353,7 @@ module LanguageService =
         | Some cl ->
             let req : FsProj.DotnetFileRequest   = {
                 FsProj = fsproj
-                File = file
+                FileVirtualPath = file
             }
 
             cl.sendRequest("fsproj/addFile", req)