Skip to content

Commit 63a98d4

Browse files
authored
some cleanup in src/Components (ionide#1921)
1 parent 130bfe7 commit 63a98d4

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

src/Components/Diagnostics.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Error: %A
5353
5454
### Steps to reproduce
5555
56-
<!-- Add here the step to reproduce you problem. Example: -->
56+
<!-- Add here the steps to reproduce you problem. Example: -->
5757
<!-- 1. Open an F# file -->
5858
<!-- 2. Ctrl + P > "F# Add Reference" -->
5959
"""

src/Components/Gitignore.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// Prompt users to add VSCode lines to their gitignore if the config is set
1+
// Prompt users to add VSCode lines to their gitignore if the config is set
22
namespace Ionide.VSCode.FSharp
33

44
module Gitignore =

src/Components/SolutionExplorer.fs

+10-18
Original file line numberDiff line numberDiff line change
@@ -1024,20 +1024,13 @@ module SolutionExplorer =
10241024
NodeReveal.activate context rootChanged.event treeView
10251025

10261026
let wsProvider =
1027-
let viewLoading path = "<b>Status:</b> loading.."
1027+
let viewLoading = "<b>Status:</b> loading.."
10281028

1029-
let viewLanguageNotSupported path = "<b>Status:</b> language not supported"
1029+
let viewLanguageNotSupported = "<b>Status:</b> language not supported"
10301030

10311031
let viewParsed (proj: Project) =
10321032
match getProjectModel proj with
1033-
| (Project(_,
1034-
_,
1035-
_,
1036-
files,
1037-
ProjectReferencesList(_, projRefs, _),
1038-
PackageReferenceList(_, refs, _),
1039-
_,
1040-
project)) ->
1033+
| (Project(_, _, _, _, _, PackageReferenceList(_, refs, _), _, project)) ->
10411034
let files = project.Files
10421035

10431036
let projRefs = project.ProjectReferences |> Array.map (fun n -> n.ProjectFileName)
@@ -1112,7 +1105,7 @@ module SolutionExplorer =
11121105
|> String.concat "<br />"
11131106
| _ -> "Failed to generate status report..."
11141107

1115-
let viewFailed path error =
1108+
let viewFailed error =
11161109
let sdkErrorRegex =
11171110
Regex(
11181111
"A compatible SDK version for global\.json version: \[([\d.]+)\].*was not found.*",
@@ -1154,12 +1147,11 @@ module SolutionExplorer =
11541147

11551148
match Project.tryFindInWorkspace path with
11561149
| None -> sprintf "Project '%s' not found" path
1157-
| Some(Project.ProjectLoadingState.Loading path) -> viewLoading path
1150+
| Some(Project.ProjectLoadingState.Loading _path) -> viewLoading
11581151
| Some(Project.ProjectLoadingState.Loaded proj) -> viewParsed proj
1159-
| Some(Project.ProjectLoadingState.NotRestored(path, error)) -> viewFailed path error
1160-
| Some(Project.ProjectLoadingState.Failed(path, error)) -> viewFailed path error
1161-
| Some(Project.ProjectLoadingState.LanguageNotSupported path) ->
1162-
viewLanguageNotSupported path
1152+
| Some(Project.ProjectLoadingState.NotRestored(_path, error)) -> viewFailed error
1153+
| Some(Project.ProjectLoadingState.Failed(_path, error)) -> viewFailed error
1154+
| Some(Project.ProjectLoadingState.LanguageNotSupported _path) -> viewLanguageNotSupported
11631155
| _ -> sprintf "Requested uri: %s" (uri.toString ())
11641156

11651157
U2.Case1 message |> Some }
@@ -1181,12 +1173,12 @@ module SolutionExplorer =
11811173
| ProjectFailedToLoad(_, path, name, _) -> ShowStatus.CreateOrShow(path, name)
11821174
| ProjectNotRestored(_, path, name, _) -> ShowStatus.CreateOrShow(path, name)
11831175
| Model.ProjectLoading(_, path, name) -> ShowStatus.CreateOrShow(path, name)
1184-
| Model.Project(_, path, name, _, _, _, _, proj) -> ShowStatus.CreateOrShow(path, name)
1176+
| Model.Project(_, path, name, _, _, _, _, _proj) -> ShowStatus.CreateOrShow(path, name)
11851177
| _ -> ()
11861178

11871179
let runDebug m =
11881180
match m with
1189-
| Model.Project(_, path, name, _, _, _, _, proj) -> proj |> Debugger.buildAndDebug
1181+
| Model.Project(_, _path, _name, _, _, _, _, proj) -> proj |> Debugger.buildAndDebug
11901182
| _ -> Promise.empty
11911183

11921184
let setLaunchSettingsCommand m =

0 commit comments

Comments
 (0)