From aa7a73f5066e896a38e2ea7a9882f1a28e3de1c8 Mon Sep 17 00:00:00 2001
From: Patrick Stevens <patrick+github@patrickstevens.co.uk>
Date: Sat, 3 Sep 2022 09:13:21 +0100
Subject: [PATCH] Make Rider a bit happier (#3)

---
 Git.Test/TestInit.fs     |  2 +-
 Git.sln.DotSettings      |  5 +++++
 Git/Commit.fs            |  2 +-
 Git/EncodedObject.fs     |  2 +-
 Git/Hash.fs              |  2 +-
 Git/Repository.fs        | 16 ++++++++--------
 Git/Stream.fs            |  2 +-
 Git/SymbolicReference.fs |  2 +-
 Git/Tree.fs              |  1 -
 9 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 Git.sln.DotSettings

diff --git a/Git.Test/TestInit.fs b/Git.Test/TestInit.fs
index cb32a15..0e35b64 100644
--- a/Git.Test/TestInit.fs
+++ b/Git.Test/TestInit.fs
@@ -20,7 +20,7 @@ module TestInit =
 
         gitDir.Create ()
 
-        let r =
+        let _ =
             match Repository.init gitDir with
             | Ok r -> r
             | Error r -> failwithf "Failed to init repo: %+A" r
diff --git a/Git.sln.DotSettings b/Git.sln.DotSettings
new file mode 100644
index 0000000..f577293
--- /dev/null
+++ b/Git.sln.DotSettings
@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FSharpInterpolatedString/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=FSharpRedundantDotInIndexer/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Chacon/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=failwithf/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Git/Commit.fs b/Git/Commit.fs
index e870277..0b71b2c 100644
--- a/Git/Commit.fs
+++ b/Git/Commit.fs
@@ -120,7 +120,7 @@ module Commit =
             | Some hash -> hash |> Hash.ofSpelling
 
         let consumeLabelledHash (expecting : OneOf) : string * Hash =
-            let w = consumeWord (expecting)
+            let w = consumeWord expecting
             let h = consumeHash w
             w, h
 
diff --git a/Git/EncodedObject.fs b/Git/EncodedObject.fs
index 7c4f9b6..e29aa18 100644
--- a/Git/EncodedObject.fs
+++ b/Git/EncodedObject.fs
@@ -99,7 +99,7 @@ module EncodedObject =
         let objectName = hashStr.[2..]
         let subDir = hashStr.[0..1]
 
-        let d = Repository.createSubdir (Repository.objectDir r) subDir
+        let d = Repository.createSubDir (Repository.objectDir r) subDir
         use filestream = r.Fs.File.Create (r.Fs.Path.Combine (d.FullName, objectName))
 
         compress o filestream
diff --git a/Git/Hash.fs b/Git/Hash.fs
index 8829192..668769f 100644
--- a/Git/Hash.fs
+++ b/Git/Hash.fs
@@ -50,7 +50,7 @@ module Hash =
         let rec b (pos : int) =
             seq {
                 if pos < input.Length then
-                    yield value (input.[pos]) * 16uy + value input.[pos + 1]
+                    yield value input.[pos] * 16uy + value input.[pos + 1]
                     yield! b (pos + 2)
             }
 
diff --git a/Git/Repository.fs b/Git/Repository.fs
index 3e1fb42..e00eb12 100644
--- a/Git/Repository.fs
+++ b/Git/Repository.fs
@@ -30,7 +30,7 @@ module Repository =
         r.Fs.Path.Combine ((gitDir r).FullName, "refs")
         |> r.Fs.DirectoryInfo.FromDirectoryName
 
-    let internal createSubdir (r : IDirectoryInfo) (name : string) : IDirectoryInfo =
+    let internal createSubDir (r : IDirectoryInfo) (name : string) : IDirectoryInfo =
         let output =
             r.FileSystem.Path.Combine (r.FullName, name)
             |> r.FileSystem.DirectoryInfo.FromDirectoryName
@@ -64,12 +64,12 @@ module Repository =
         else
 
         // TODO do this atomically
-        let gitDir = createSubdir dir ".git"
-        let objectDir = createSubdir gitDir "objects"
-        let _packDir = createSubdir objectDir "pack"
-        let _infoDir = createSubdir objectDir "info"
-        let refsDir = createSubdir gitDir "refs"
-        let _headsDir = createSubdir refsDir "heads"
-        let _tagsDir = createSubdir refsDir "tags"
+        let gitDir = createSubDir dir ".git"
+        let objectDir = createSubDir gitDir "objects"
+        let _packDir = createSubDir objectDir "pack"
+        let _infoDir = createSubDir objectDir "info"
+        let refsDir = createSubDir gitDir "refs"
+        let _headsDir = createSubDir refsDir "heads"
+        let _tagsDir = createSubDir refsDir "tags"
 
         make dir |> Option.get |> Ok
diff --git a/Git/Stream.fs b/Git/Stream.fs
index 1dc41d6..bfe18ac 100644
--- a/Git/Stream.fs
+++ b/Git/Stream.fs
@@ -52,5 +52,5 @@ module internal Stream =
 
     let consumeToEnd (b : MemoryStream) : byte array =
         use newMs = new MemoryStream ()
-        b.CopyTo (newMs)
+        b.CopyTo newMs
         newMs.ToArray ()
diff --git a/Git/SymbolicReference.fs b/Git/SymbolicReference.fs
index d6c3131..fa71461 100644
--- a/Git/SymbolicReference.fs
+++ b/Git/SymbolicReference.fs
@@ -12,7 +12,7 @@ type SymbolicRef =
     | MergeHead
     | Head
     | OrigHead
-    // TODO - determine how an arbitrary symbolicref actually behaves
+    // TODO - determine how an arbitrary symbolic ref actually behaves
     | Verbatim of string
 
     override this.ToString () : string =
diff --git a/Git/Tree.fs b/Git/Tree.fs
index 72cef0b..899231a 100644
--- a/Git/Tree.fs
+++ b/Git/Tree.fs
@@ -1,7 +1,6 @@
 namespace Git
 
 open System
-open System.Collections.Generic
 open System.IO
 open System.Text
 open Git.Internals