Reduce project option duplication, reducing memory usage. #1147
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheAngryByrd
commented
Jul 22, 2023
Comment on lines
+63
to
+77
| [<CustomEquality; NoComparison>] | ||
| type LoadedProject = | ||
| { FSharpProjectOptions: FSharpProjectOptions | ||
| LanguageVersion: LanguageVersionShim } | ||
|
|
||
| type LoadedProject = | ||
| | LoadedProjectFile of LoadedProjectFile | ||
| | LoadedScriptFile of LoadedScriptFile | ||
| interface IEquatable<LoadedProject> with | ||
| member x.Equals(other) = | ||
| x.FSharpProjectOptions = other.FSharpProjectOptions | ||
|
|
||
| member x.FSharpProjectOptions = | ||
| match x with | ||
| | LoadedProjectFile p -> p.FSharpProjectOptions | ||
| | LoadedScriptFile p -> p.FSharpProjectOptions | ||
| override x.GetHashCode() = x.FSharpProjectOptions.GetHashCode() | ||
|
|
||
| member x.LanguageVersion = | ||
| match x with | ||
| | LoadedProjectFile p -> p.LanguageVersion | ||
| | LoadedScriptFile p -> p.LanguageVersion | ||
| override x.Equals(other) = | ||
| match other with | ||
| | :? LoadedProject as other -> (x :> IEquatable<_>).Equals other | ||
| | _ -> false |
There was a problem hiding this comment.
We don't really need to keep ProjectOptions so condensing this type. Also makes it use FSharpProjectOptions as its equality.
| projectOptions | ||
| |> List.map (fun o -> | ||
| let fso = FCS.mapToFSharpProjectOptions o projectOptions | ||
| let fsharpOptions = projectOptions |> FCS.mapManyOptions |> Seq.toList |
There was a problem hiding this comment.
This is the main change. We had this in Ionide.ProjInfo but weren't using it. This prevent recreation of referenced types.
TheAngryByrd
force-pushed
the
fix-projectOptions-memory-usage
branch
from
08fadc8 to
c527897
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WHAT
🤖 Generated by Copilot at 08fadc8
Improved project and script loading to handle multi-targeting scenarios. Replaced the
LoadedProjectdiscriminated union with a simpler record type. RefactoredloadProjectinAdaptiveFSharpLspServer.fsto use the new type and logic.🤖 Generated by Copilot at 08fadc8
🔄📝🚀
WHY
I noticed we were creating way to many project options.
After the change it doesn't really show up now.
HOW
🤖 Generated by Copilot at 08fadc8
LoadedProjecttype to use a record with custom equality instead of a union ofLoadedProjectFileandLoadedScriptFile(link)FCS.mapManyOptionsto handle multiple project options per file and support multi-targeting projects and scripts (link, link, link, link)ProjectFileNameproperty ofFSharpProjectOptionsinstead ofProjectOptionsto avoid null values for scripts (link)LoadedScriptFilecase fromLoadedProjecttype (link)