Use GetSubTextFromRange instead of extension GetContentAt (fsprojects…

…#3029) * Use GetSubTextFromRange instead of extension GetContentAt * Add comment.
nojaf · Jan 2, 2024 · 79e8355 · 79e8355
1 parent a999b77
commit 79e8355
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 41 deletions.
diff --git a/src/Fantomas.Core/ASTTransformer.fs b/src/Fantomas.Core/ASTTransformer.fs
@@ -7,7 +7,6 @@ open Fantomas.FCS.Text.Range
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Xml
-open Fantomas.Core.ISourceTextExtensions
 open Fantomas.Core.RangePatterns
 open Fantomas.Core.SyntaxOak
 open Microsoft.FSharp.Core
@@ -19,7 +18,7 @@ type CreationAide =
     member x.TextFromSource fallback range =
         match x.SourceText with
         | None -> fallback ()
-        | Some sourceText -> sourceText.GetContentAt range
+        | Some sourceText -> sourceText.GetSubTextFromRange range
 
 let stn text range = SingleTextNode(text, range)
 

diff --git a/src/Fantomas.Core/Fantomas.Core.fsproj b/src/Fantomas.Core/Fantomas.Core.fsproj
@@ -8,8 +8,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="ISourceTextExtensions.fsi" />
-    <Compile Include="ISourceTextExtensions.fs" />
     <Compile Include="RangeHelpers.fsi" />
     <Compile Include="RangeHelpers.fs" />
     <Compile Include="Utils.fsi" />

diff --git a/src/Fantomas.Core/ISourceTextExtensions.fs b/src/Fantomas.Core/ISourceTextExtensions.fs
diff --git a/src/Fantomas.Core/ISourceTextExtensions.fsi b/src/Fantomas.Core/ISourceTextExtensions.fsi
diff --git a/src/Fantomas.Core/Selection.fs b/src/Fantomas.Core/Selection.fs
@@ -2,7 +2,6 @@
 
 open Fantomas.FCS.Text
 open Fantomas.Core.SyntaxOak
-open Fantomas.Core.ISourceTextExtensions
 
 let correctSelection (fileIndex: int) (sourceText: ISourceText) (selection: range) =
     let lines =
@@ -428,7 +427,7 @@ let formatSelection
                     match rangeOfSelection with
                     | None ->
                         raise (FormatException("No suitable AST node could be extracted from formatted selection."))
-                    | Some m -> source.GetContentAt m
+                    | Some m -> source.GetSubTextFromRange m
 
             return formattedSelection.TrimEnd([| '\r'; '\n' |]), selection
     }
diff --git a/src/Fantomas.Core/Trivia.fs b/src/Fantomas.Core/Trivia.fs
@@ -4,7 +4,6 @@ open System
 open Fantomas.FCS.Syntax
 open Fantomas.FCS.SyntaxTrivia
 open Fantomas.FCS.Text
-open Fantomas.Core.ISourceTextExtensions
 open Fantomas.Core.SyntaxOak
 
 type CommentTrivia with
@@ -23,7 +22,7 @@ let internal collectTriviaFromCodeComments
     |> List.filter (fun ct -> RangeHelpers.rangeContainsRange codeRange ct.Range)
     |> List.map (function
         | CommentTrivia.BlockComment r ->
-            let content = source.GetContentAt r
+            let content = source.GetSubTextFromRange r
             let startLine = source.GetLineString(r.StartLine - 1)
             let endLine = source.GetLineString(r.EndLine - 1)
 
@@ -40,7 +39,7 @@ let internal collectTriviaFromCodeComments
 
             TriviaNode(content, r)
         | CommentTrivia.LineComment r ->
-            let content = source.GetContentAt r
+            let content = source.GetSubTextFromRange r
             let index = r.StartLine - 1
             let line = source.GetLineString index
 
@@ -146,7 +145,7 @@ let internal collectTriviaFromDirectives
     |> List.filter (fun cdt -> RangeHelpers.rangeContainsRange codeRange cdt.Range)
     |> List.map (fun cdt ->
         let m = cdt.Range
-        let text = (source.GetContentAt m).TrimEnd()
+        let text = (source.GetSubTextFromRange m).TrimEnd()
         let content = Directive text
         TriviaNode(content, m))
 

diff --git a/src/Fantomas.FCS/Fantomas.FCS.fsproj b/src/Fantomas.FCS/Fantomas.FCS.fsproj
@@ -5,6 +5,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);57;</NoWarn> <!-- Experimental -->
     <NoWarn>$(NoWarn);1204</NoWarn> <!-- This construct is for use in the FSharp.Core library and should not be used directly -->
+    <NoWarn>$(NoWarn);1178</NoWarn> <!-- FS1178 does not support structural equality -->
     <DefineConstants>$(DefineConstants);COMPILER;FSHARPCORE_USE_PACKAGE</DefineConstants>
     <FsYaccOutputFolder>generated\$(TargetFramework)\</FsYaccOutputFolder>
     <FsLexOutputFolder>generated\$(TargetFramework)\</FsLexOutputFolder>