Add more type annotations

iminashi · iminashi · commit 3cea90980a46 · 2025-12-15T17:24:19.000+02:00
diff --git a/src/Rocksmith2014.XML.Extension/XmlEntities.fs b/src/Rocksmith2014.XML.Extension/XmlEntities.fs
@@ -7,7 +7,7 @@ type XmlEntity =
     | XmlNote of XmlNote: Note
     | XmlChord of XmlChord: Chord
 
-let inline getTimeCode entity =
+let inline getTimeCode (entity: XmlEntity) =
     match entity with
     | XmlNote xn -> xn.Time
     | XmlChord xc -> xc.Time
diff --git a/src/Rocksmith2014.XML.Processing/ArrangementChecker.fs b/src/Rocksmith2014.XML.Processing/ArrangementChecker.fs
@@ -3,10 +3,10 @@ module Rocksmith2014.XML.Processing.ArrangementChecker
 open Rocksmith2014.XML
 
 /// Runs all the checks on the given arrangement.
-let checkInstrumental arrangement = InstrumentalChecker.runAllChecks arrangement
+let checkInstrumental (arrangement: InstrumentalArrangement) = InstrumentalChecker.runAllChecks arrangement
 
 /// Checks the vocals for issues.
 let checkVocals (customFont: GlyphDefinitions option) (vocals: ResizeArray<Vocal>) = VocalsChecker.check customFont vocals
 
 /// Checks that the show lights have at least one beam and one fog note.
-let checkShowlights showLights = ShowLightsChecker.check showLights
+let checkShowlights (showLights: ResizeArray<ShowLight>) = ShowLightsChecker.check showLights
diff --git a/src/Rocksmith2014.XML.Processing/ArrangementImprover.fs b/src/Rocksmith2014.XML.Processing/ArrangementImprover.fs
@@ -1,5 +1,7 @@
 module Rocksmith2014.XML.Processing.ArrangementImprover
 
+open Rocksmith2014.XML
+
 /// Adds crowd events to the arrangement if it does not have them.
 let addCrowdEvents = CrowdEventAdder.improve
 
@@ -19,7 +21,7 @@ let movePhrases = PhraseMover.improve
 let processCustomEvents = CustomEvents.improve
 
 /// Applies all the improvements to the arrangement.
-let applyAll arrangement =
+let applyAll (arrangement: InstrumentalArrangement) =
     BasicFixes.validatePhraseNames arrangement
     BasicFixes.addIgnores arrangement
     BasicFixes.fixLinkNexts arrangement
@@ -39,7 +41,7 @@ let applyAll arrangement =
     HandShapeAdjuster.shortenHandshapes arrangement
 
 /// Applies the basic needed improvements to the arrangement.
-let applyMinimum arrangement =
+let applyMinimum (arrangement: InstrumentalArrangement) =
     BasicFixes.validatePhraseNames arrangement
     BasicFixes.addIgnores arrangement
     BasicFixes.removeOverlappingBendValues arrangement
diff --git a/src/Rocksmith2014.XML.Processing/Checkers/InstrumentalChecker.fs b/src/Rocksmith2014.XML.Processing/Checkers/InstrumentalChecker.fs
@@ -1,12 +1,12 @@
 module Rocksmith2014.XML.Processing.InstrumentalChecker
 
-open Rocksmith2014.XML
-open Rocksmith2014.XML.Extensions
 open System
 open System.Collections.Generic
 open System.Runtime.CompilerServices
 open System.Text.RegularExpressions
-open Utils
+open Rocksmith2014.XML
+open Rocksmith2014.XML.Extensions
+open Rocksmith2014.XML.Processing.Utils
 
 [<IsReadOnly; Struct>]
 type private NgSection = { StartTime: int; EndTime: int }
@@ -59,7 +59,7 @@ let private getEndTime (arrangement: InstrumentalArrangement) =
     |> Option.map (fun pi -> pi.Time)
     |> Option.defaultValue arrangement.MetaData.SongLength
 
-let private isInsideNoguitarSection noGuitarSections (time: int) =
+let private isInsideNoguitarSection (noGuitarSections: NgSection array) (time: int) =
     noGuitarSections
     |> Array.exists (fun x -> time >= x.StartTime && time < x.EndTime)
 
@@ -116,7 +116,7 @@ let private checkLinkNext (level: Level) (currentIndex: int) (note: Note) =
         | _ ->
             None
 
-let private isOnToneChange (arr: InstrumentalArrangement) time =
+let private isOnToneChange (arr: InstrumentalArrangement) (time: int) =
     notNull arr.Tones.Changes
     && arr.Tones.Changes.Exists(fun t -> t.Time = time)
 
@@ -455,7 +455,7 @@ let checkHandshapes (arrangement: InstrumentalArrangement) (level: Level) =
     ]
 
 /// Looks for anchors that will break a handshape.
-let private findAnchorsInsideHandShapes isMoverPhraseTime phraseTimes (level: Level) =
+let private findAnchorsInsideHandShapes (isMoverPhraseTime: int -> bool) (phraseTimes: Set<int>) (level: Level) =
     level.Anchors
     |> Seq.filter (fun anchor ->
         level.HandShapes.Exists(fun hs -> anchor.Time > hs.StartTime && anchor.Time < hs.EndTime)
@@ -467,7 +467,7 @@ let private findAnchorsInsideHandShapes isMoverPhraseTime phraseTimes (level: Le
             issue AnchorInsideHandShape anchor.Time)
 
 /// Looks for anchors very close to the end of unpitched slide notes.
-let private findUnpitchedSlideAnchors isMoverPhraseTime (level: Level) =
+let private findUnpitchedSlideAnchors (isMoverPhraseTime: int -> bool) (level: Level) =
     let slideEnds =
         level.Notes
         |> Seq.filter (fun n -> n.IsUnpitchedSlide)
@@ -569,7 +569,7 @@ let private getInstrumentalChecks (arr: InstrumentalArrangement) =
        checkHandshapes arr
        checkAnchors arr |]
 
-let private parallelizeInstrumentalCheck arr =
+let private parallelizeInstrumentalCheck (arr: InstrumentalArrangement) =
     let checks = getInstrumentalChecks arr
     if arr.Levels.Count = 1 then
         let level = arr.Levels[0]
diff --git a/src/Rocksmith2014.XML.Processing/Checkers/VocalsChecker.fs b/src/Rocksmith2014.XML.Processing/Checkers/VocalsChecker.fs
@@ -1,9 +1,9 @@
 module Rocksmith2014.XML.Processing.VocalsChecker
 
-open Rocksmith2014.XML
 open System
 open System.Text
-open Utils
+open Rocksmith2014.XML
+open Rocksmith2014.XML.Processing.Utils
 
 let [<Literal>] LyricsCharset =
     """ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~¡¢¥¦§¨ª«°²³´•¸¹º»¼½¾¿ÀÁÂÄÅÆÇÈÉÊËÌÎÏÑÒÓÔÖØÙÚÛÜÞßàáâäåæçèéêëìíîïñòóôöøùúûüŒœŠšž„…€™␀★➨"""
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/AnchorMover.fs b/src/Rocksmith2014.XML.Processing/Improvers/AnchorMover.fs
@@ -1,7 +1,7 @@
 module Rocksmith2014.XML.Processing.AnchorMover
 
-open Rocksmith2014.XML
 open System
+open Rocksmith2014.XML
 
 let private pickTimeAndDistance (anchor: Anchor) (noteTime: int) =
     let distance = anchor.Time - noteTime
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/BasicFixes.fs b/src/Rocksmith2014.XML.Processing/Improvers/BasicFixes.fs
@@ -1,8 +1,8 @@
 module Rocksmith2014.XML.Processing.BasicFixes
 
-open Rocksmith2014.XML
-open System.Text.RegularExpressions
 open System.Collections.Generic
+open System.Text.RegularExpressions
+open Rocksmith2014.XML
 
 /// Filters the characters in the arrangement's phrase names.
 ///
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/ChordNameProcessor.fs b/src/Rocksmith2014.XML.Processing/Improvers/ChordNameProcessor.fs
@@ -1,9 +1,9 @@
 module Rocksmith2014.XML.Processing.ChordNameProcessor
 
-open Rocksmith2014.XML
 open System
+open Rocksmith2014.XML
 
-let private emptyOrElse name orElse =
+let private emptyOrElse (name: string) (orElse: string -> string) =
     if String.IsNullOrWhiteSpace(name) then
         String.Empty
     else
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/CrowdEventAdder.fs b/src/Rocksmith2014.XML.Processing/Improvers/CrowdEventAdder.fs
@@ -1,8 +1,8 @@
 module Rocksmith2014.XML.Processing.CrowdEventAdder
 
+open System.Text.RegularExpressions
 open Rocksmith2014.XML
 open Rocksmith2014.XML.Extensions
-open System.Text.RegularExpressions
 
 let [<Literal>] private IntroCrowdReactionDelay = 600 // 0.6 s
 let [<Literal>] private IntroApplauseLength = 2_500 // 2.5 s
@@ -17,7 +17,7 @@ module private Events =
     let [<Literal>] CrowdSpeedMedium = "e1"
     let [<Literal>] CrowdSpeedFast = "e2"
 
-let private crowdSpeedFromTempo averageTempo =
+let private crowdSpeedFromTempo (averageTempo: float32) =
     if averageTempo < 90f then
         Events.CrowdSpeedSlow
     elif averageTempo < 170f then
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/CustomEvents.fs b/src/Rocksmith2014.XML.Processing/Improvers/CustomEvents.fs
@@ -1,9 +1,9 @@
 module Rocksmith2014.XML.Processing.CustomEvents
 
-open Rocksmith2014.XML
-open Rocksmith2014.XML.Extensions
 open System
 open System.Globalization
+open Rocksmith2014.XML
+open Rocksmith2014.XML.Extensions
 
 /// Processes custom events.
 let improve (arrangement: InstrumentalArrangement) =
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/EOFFixes.fs b/src/Rocksmith2014.XML.Processing/Improvers/EOFFixes.fs
@@ -1,8 +1,8 @@
 module Rocksmith2014.XML.Processing.EOFFixes
 
+open System.Text.RegularExpressions
 open Rocksmith2014.XML
 open Rocksmith2014.XML.Extensions
-open System.Text.RegularExpressions
 
 /// Adds linknext to chords that have linknext chord notes, but are missing the attribute.
 /// Fixes the sustain to be same for all chord notes.
@@ -87,7 +87,7 @@ let fixPhraseStartAnchors (arrangement: InstrumentalArrangement) =
                         nextAnchor.Time <- piTime
 
 /// Applies all the fixes.
-let fixAll arrangement =
+let fixAll (arrangement: InstrumentalArrangement) =
     fixCrowdEvents arrangement
     fixChordNotes arrangement
     removeInvalidChordNoteLinkNexts arrangement
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/HandShapeAdjuster.fs b/src/Rocksmith2014.XML.Processing/Improvers/HandShapeAdjuster.fs
@@ -2,9 +2,9 @@ module Rocksmith2014.XML.Processing.HandShapeAdjuster
 
 open Rocksmith2014.XML
 open Rocksmith2014.XML.Extensions
-open Utils
+open Rocksmith2014.XML.Processing.Utils
 
-let private isChordSlideAt (level: Level) time  =
+let private isChordSlideAt (level: Level) (time: int)  =
     match level.Chords.FindByTime(time) with
     | null ->
         false
diff --git a/src/Rocksmith2014.XML.Processing/Improvers/PhraseMover.fs b/src/Rocksmith2014.XML.Processing/Improvers/PhraseMover.fs
@@ -1,11 +1,11 @@
 module Rocksmith2014.XML.Processing.PhraseMover
 
-open Rocksmith2014.XML
-open Rocksmith2014.XML.Extensions
 open System
 open System.Globalization
+open Rocksmith2014.XML
+open Rocksmith2014.XML.Extensions
 
-let private getMoveBy phraseTime (phraseToMove: Phrase) =
+let private getMoveBy (phraseTime: int) (phraseToMove: Phrase) =
     let number = phraseToMove.Name.AsSpan("mover".Length)
 
     match Int32.TryParse(number, NumberStyles.Integer, NumberFormatInfo.InvariantInfo) with
diff --git a/src/Rocksmith2014.XML.Processing/PhraseGenerator.fs b/src/Rocksmith2014.XML.Processing/PhraseGenerator.fs
@@ -2,7 +2,7 @@ module Rocksmith2014.XML.Processing.PhraseGenerator
 
 open Rocksmith2014.XML
 open Rocksmith2014.XML.Extensions
-open Utils
+open Rocksmith2014.XML.Processing.Utils
 
 /// Minimum distance required between phrases in milliseconds.
 let [<Literal>] private MinimumPhraseSeparation = 2000
@@ -84,7 +84,7 @@ module private Helpers =
     let getContentStartTime (level: Level) =
         tryFindNextContentTime level 0
 
-    let getFirstPhraseTime contentStartTime (arr: Inst) =
+    let getFirstPhraseTime (contentStartTime: int) (arr: Inst) =
         let firstBeatTime = arr.Ebeats[0].Time
 
         if firstBeatTime = contentStartTime then
@@ -118,7 +118,7 @@ module private Helpers =
                 arr.Sections.Add(Section("noguitar", time, ngSectionNumber))
                 ngSectionNumber <- ngSectionNumber + 1s
 
-    let addEndPhrase endPhraseTime (arr: Inst) =
+    let addEndPhrase (endPhraseTime: int) (arr: Inst) =
         arr.PhraseIterations.Add(PhraseIteration(endPhraseTime, arr.Phrases.Count))
         arr.Phrases.Add(Phrase(EndPhraseName, 0uy, PhraseMask.None))
         addSection NoGuitar endPhraseTime arr
@@ -128,7 +128,7 @@ module private Helpers =
         arr.PhraseIterations.Clear()
         arr.Sections.Clear()
 
-    let addFirstPhrase firstPhraseResult (arr: Inst) =
+    let addFirstPhrase (firstPhraseResult: FirstPhraseResult) (arr: Inst) =
         arr.Phrases.Add(Phrase(FirstPhraseName, 0uy, PhraseMask.None))
 
         match firstPhraseResult with
@@ -138,7 +138,7 @@ module private Helpers =
             arr.Ebeats.Insert(0, newBeat)
             arr.PhraseIterations.Add(PhraseIteration(newBeat.Time, 0))
 
-    let closestToInitial initial startTime endTime =
+    let closestToInitial (initial: int) (startTime: int) (endTime: int) =
         if initial - startTime < endTime - initial then
             startTime
         else
diff --git a/src/Rocksmith2014.XML.Processing/Utils.fs b/src/Rocksmith2014.XML.Processing/Utils.fs
@@ -6,13 +6,13 @@ let internal issue type' time = IssueWithTimeCode(type', time)
 
 [<RequireQualifiedAccess>]
 module Option =
-    let minOfMany options =
+    let minOfMany (options: 'a option list) =
         options
         |> List.collect Option.toList
         |> List.tryMin
 
 /// Converts a time in milliseconds into a string.
-let timeToString time =
+let timeToString (time: int) =
     let minutes = time / 1000 / 60
     let seconds = (time / 1000) - (minutes * 60)
 
@@ -21,7 +21,7 @@ let timeToString time =
 
     $"{minutes:D2}:{seconds:D2}.{milliSeconds:D3}"
 
-let private getTimes<'a when 'a :> IHasTimeCode> startTime count (items: 'a seq) =
+let private getTimes<'a when 'a :> IHasTimeCode> (startTime: int) (count: int) (items: 'a seq) =
     items
     |> Seq.filter (fun x -> x.Time >= startTime)
     |> Seq.map (fun x -> x.Time)
