Fix an issue where a new file was added to wrong project in solution

The issue happened when there were two projects in solution:
- Project/Project.csproj
- ProjectTwo/ProjectTwo.csproj

When adding ProjectTwo/Class.cs it would add file to
Project/Project.csproj instead of ProjectTwo as it should.

Author: razzmatazz

CHANGELOG.md

@@ -13,6 +13,7 @@ with the next provider to be more resilent;
   - move static members to another class;
   - generate overrides;
   - others;
+* Fix an issue where a new file was added to wrong project.
 
 ## [0.5.5] - 2022-08-23 / Prienai
 * Fix intermittent server crashes after upgrading to latest Ionide.LanguageServerProtocol:

src/CSharpLanguageServer/RoslynHelpers.fs

@@ -908,7 +908,7 @@ let getFullReflectionName (containingType: INamedTypeSymbol) =
 
     String.Join(".", stack)
 
-let tryAddDocument _logMessage
+let tryAddDocument logMessage
                    (docFilePath: string)
                    (text: string)
                    (solution: Solution)
@@ -917,23 +917,30 @@ let tryAddDocument _logMessage
     let docDir = Path.GetDirectoryName(docFilePath)
     //logMessage (sprintf "TextDocumentDidOpen: docFilename=%s docDir=%s" docFilename docDir)
 
-    let matchesPath (p: Project) =
+    let fileOnProjectDir (p: Project) =
         let projectDir = Path.GetDirectoryName(p.FilePath)
-        (docDir |> string).StartsWith(projectDir |> string)
+        let projectDirWithDirSepChar = projectDir + (string Path.DirectorySeparatorChar)
 
-    let projectOnPath = solution.Projects |> Seq.filter matchesPath |> Seq.tryHead
+        (docDir = projectDir) || docDir.StartsWith(projectDirWithDirSepChar)
+
+    let projectOnPath =
+        solution.Projects
+        |> Seq.filter fileOnProjectDir
+        |> Seq.tryHead
 
     match projectOnPath with
     | Some proj ->
         let projectBaseDir = Path.GetDirectoryName(proj.FilePath)
         let docName = docFilePath.Substring(projectBaseDir.Length+1)
 
-        //logMessage (sprintf "Adding file %s (\"%s\") to project %s" docName docFilePath proj.FilePath)
+        logMessage (sprintf "Adding \"%s\" (\"%s\") to project %s" docName docFilePath proj.FilePath)
 
         let newDoc = proj.AddDocument(name=docName, text=SourceText.From(text), folders=null, filePath=docFilePath)
         Some newDoc
 
-    | None -> None
+    | None ->
+        logMessage (sprintf "No parent project could be resolved to add file \"%s\" to workspace" docFilePath)
+        None
 
 let processChange (oldText: SourceText) (change: TextChange) : TextEdit =
     let mapToTextEdit(linePosition: LinePositionSpan, newText: string) : TextEdit =

src/CSharpLanguageServer/Server.fs

@@ -306,9 +306,9 @@ let setupServerHandlers options (lspClient: LspClient) =
                 // ok, this document is not on solution, register a new one
                 let docFilePath = openParams.TextDocument.Uri.Substring("file://".Length)
                 let newDocMaybe = tryAddDocument logMessage
-                                                docFilePath
-                                                openParams.TextDocument.Text
-                                                scope.Solution
+                                                 docFilePath
+                                                 openParams.TextDocument.Text
+                                                 scope.Solution
                 match newDocMaybe with
                 | Some newDoc ->
                     scope.Emit(SolutionChange newDoc.Project.Solution)