Skip to content

Commit 9396d6d

Browse files
auduchinokauduchinok
committed
Rename
1 parent 27b0e83 commit 9396d6d

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎src/Compiler/Symbols/Symbols.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ type FSharpDisplayContext(denv: TcGlobals -> DisplayEnv) =
222222

223223

224224
[<Struct>]
225-
type ObsoleteDiagnosticInfo =
225+
type FSharpObsoleteDiagnosticInfo =
226226
{ IsError: bool
227227
DiagnosticId: string option
228228
Message: string option
@@ -373,7 +373,7 @@ type FSharpSymbol(cenv: SymbolEnv, item: unit -> Item, access: FSharpSymbol -> C
373373
member sym.TryGetAttribute<'T>() =
374374
sym.Attributes |> Seq.tryFind (fun attr -> attr.IsAttribute<'T>())
375375

376-
abstract ObsoleteDiagnosticInfo: ObsoleteDiagnosticInfo option
376+
abstract ObsoleteDiagnosticInfo: FSharpObsoleteDiagnosticInfo option
377377
default _.ObsoleteDiagnosticInfo = None
378378

379379
type FSharpEntity(cenv: SymbolEnv, entity: EntityRef, tyargs: TType list) =
@@ -872,7 +872,7 @@ type FSharpEntity(cenv: SymbolEnv, entity: EntityRef, tyargs: TType list) =
872872
try x.MembersFunctionsAndValues with _ -> [||] :> _
873873

874874
override this.ObsoleteDiagnosticInfo =
875-
TryGetEntityObsoleteInfo cenv.g entity |> Option.map ObsoleteDiagnosticInfo.FromDiagnosticInfo
875+
TryGetEntityObsoleteInfo cenv.g entity |> Option.map FSharpObsoleteDiagnosticInfo.FromDiagnosticInfo
876876

877877
member this.TryGetMetadataText() =
878878
match entity.TryDeref with
@@ -1317,7 +1317,7 @@ type FSharpField(cenv: SymbolEnv, d: FSharpFieldData) =
13171317
| Choice2Of3 ilFieldInfo -> TryGetILFieldObsoleteInfo cenv.g ilFieldInfo
13181318
| Choice3Of3 _ -> None
13191319

1320-
infoOption |> Option.map ObsoleteDiagnosticInfo.FromDiagnosticInfo
1320+
infoOption |> Option.map FSharpObsoleteDiagnosticInfo.FromDiagnosticInfo
13211321

13221322
member private x.V = d
13231323

@@ -2568,7 +2568,7 @@ type FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) =
25682568
| C minfo -> TryGetMethodObsoleteInfo minfo
25692569
| V vref -> TryGetFSharpObsoleteInfo cenv.g vref.Attribs
25702570

2571-
infoOption |> Option.map ObsoleteDiagnosticInfo.FromDiagnosticInfo
2571+
infoOption |> Option.map FSharpObsoleteDiagnosticInfo.FromDiagnosticInfo
25722572

25732573
type FSharpType(cenv, ty:TType) =
25742574

‎src/Compiler/Symbols/Symbols.fsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type FSharpDisplayContext =
8080
member WithTopLevelPrefixGenericParameters: unit -> FSharpDisplayContext
8181

8282
[<Struct>]
83-
type ObsoleteDiagnosticInfo =
83+
type FSharpObsoleteDiagnosticInfo =
8484
{ IsError: bool
8585
DiagnosticId: string option
8686
Message: string option
@@ -155,7 +155,7 @@ type FSharpSymbol =
155155
/// Indicates if this symbol has an attribute matching the full name of the given type parameter
156156
member HasAttribute<'T> : unit -> bool
157157

158-
abstract ObsoleteDiagnosticInfo: ObsoleteDiagnosticInfo option
158+
abstract ObsoleteDiagnosticInfo: FSharpObsoleteDiagnosticInfo option
159159

160160
/// Represents an assembly as seen by the F# language
161161
type FSharpAssembly =

‎tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.bsl‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5277,10 +5277,10 @@ FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Collections.FSharpList`1[
52775277
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Collections.FSharpList`1[System.String] get_AllCompilationPaths()
52785278
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpEntity] DeclaringEntity
52795279
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpEntity] get_DeclaringEntity()
5280+
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5281+
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
52805282
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpType] BaseType
52815283
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpType] get_BaseType()
5282-
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5283-
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
52845284
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.ISourceText] TryGetMetadataText()
52855285
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[System.String] BasicQualifiedName
52865286
FSharp.Compiler.Symbols.FSharpEntity: Microsoft.FSharp.Core.FSharpOption`1[System.String] Namespace
@@ -5415,10 +5415,10 @@ FSharp.Compiler.Symbols.FSharpField: FSharp.Compiler.Text.Range get_DeclarationL
54155415
FSharp.Compiler.Symbols.FSharpField: Int32 GetHashCode()
54165416
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpEntity] DeclaringEntity
54175417
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpEntity] get_DeclaringEntity()
5418+
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5419+
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
54185420
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpUnionCase] DeclaringUnionCase
54195421
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpUnionCase] get_DeclaringUnionCase()
5420-
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5421-
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
54225422
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[System.Object] LiteralValue
54235423
FSharp.Compiler.Symbols.FSharpField: Microsoft.FSharp.Core.FSharpOption`1[System.Object] get_LiteralValue()
54245424
FSharp.Compiler.Symbols.FSharpField: System.Collections.Generic.IList`1[FSharp.Compiler.Symbols.FSharpAttribute] FieldAttributes
@@ -5698,10 +5698,10 @@ FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSh
56985698
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpEntity] get_DeclaringEntity()
56995699
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue] EventForFSharpProperty
57005700
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue] get_EventForFSharpProperty()
5701+
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5702+
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
57015703
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpType] FullTypeSafe
57025704
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpType] get_FullTypeSafe()
5703-
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5704-
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
57055705
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.TaggedText[]] GetReturnTypeLayout(FSharp.Compiler.Symbols.FSharpDisplayContext)
57065706
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[System.Collections.Generic.IList`1[FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue]] GetOverloads(Boolean)
57075707
FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue: Microsoft.FSharp.Core.FSharpOption`1[System.Object] LiteralValue
@@ -5735,6 +5735,25 @@ FSharp.Compiler.Symbols.FSharpObjectExprOverride: Microsoft.FSharp.Collections.F
57355735
FSharp.Compiler.Symbols.FSharpObjectExprOverride: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpGenericParameter] get_GenericParameters()
57365736
FSharp.Compiler.Symbols.FSharpObjectExprOverride: Microsoft.FSharp.Collections.FSharpList`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue]] CurriedParameterGroups
57375737
FSharp.Compiler.Symbols.FSharpObjectExprOverride: Microsoft.FSharp.Collections.FSharpList`1[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Symbols.FSharpMemberOrFunctionOrValue]] get_CurriedParameterGroups()
5738+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean Equals(FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo)
5739+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean Equals(FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo, System.Collections.IEqualityComparer)
5740+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean Equals(System.Object)
5741+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
5742+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean IsError
5743+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Boolean get_IsError()
5744+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Int32 CompareTo(FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo)
5745+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Int32 CompareTo(System.Object)
5746+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Int32 CompareTo(System.Object, System.Collections.IComparer)
5747+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Int32 GetHashCode()
5748+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Int32 GetHashCode(System.Collections.IEqualityComparer)
5749+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] DiagnosticId
5750+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] Message
5751+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] UrlFormat
5752+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_DiagnosticId()
5753+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_Message()
5754+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_UrlFormat()
5755+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: System.String ToString()
5756+
FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo: Void .ctor(Boolean, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String])
57385757
FSharp.Compiler.Symbols.FSharpOpenDeclaration: Boolean IsOwnNamespace
57395758
FSharp.Compiler.Symbols.FSharpOpenDeclaration: Boolean get_IsOwnNamespace()
57405759
FSharp.Compiler.Symbols.FSharpOpenDeclaration: FSharp.Compiler.Syntax.SynOpenDeclTarget Target
@@ -5798,8 +5817,8 @@ FSharp.Compiler.Symbols.FSharpSymbol: FSharp.Compiler.Symbols.FSharpAssembly get
57985817
FSharp.Compiler.Symbols.FSharpSymbol: Int32 GetEffectivelySameAsHash()
57995818
FSharp.Compiler.Symbols.FSharpSymbol: Int32 GetHashCode()
58005819
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpAttribute] TryGetAttribute[T]()
5801-
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5802-
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
5820+
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] ObsoleteDiagnosticInfo
5821+
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Symbols.FSharpObsoleteDiagnosticInfo] get_ObsoleteDiagnosticInfo()
58035822
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] DeclarationLocation
58045823
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] ImplementationLocation
58055824
FSharp.Compiler.Symbols.FSharpSymbol: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] SignatureLocation
@@ -5963,25 +5982,6 @@ FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 GetHashCode(System.Collections.IEqua
59635982
FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 Tag
59645983
FSharp.Compiler.Symbols.FSharpXmlDoc: Int32 get_Tag()
59655984
FSharp.Compiler.Symbols.FSharpXmlDoc: System.String ToString()
5966-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean Equals(FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo)
5967-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean Equals(FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo, System.Collections.IEqualityComparer)
5968-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean Equals(System.Object)
5969-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
5970-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean IsError
5971-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Boolean get_IsError()
5972-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Int32 CompareTo(FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo)
5973-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Int32 CompareTo(System.Object)
5974-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Int32 CompareTo(System.Object, System.Collections.IComparer)
5975-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Int32 GetHashCode()
5976-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Int32 GetHashCode(System.Collections.IEqualityComparer)
5977-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] DiagnosticId
5978-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] Message
5979-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] UrlFormat
5980-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_DiagnosticId()
5981-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_Message()
5982-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Microsoft.FSharp.Core.FSharpOption`1[System.String] get_UrlFormat()
5983-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: System.String ToString()
5984-
FSharp.Compiler.Symbols.ObsoleteDiagnosticInfo: Void .ctor(Boolean, Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String], Microsoft.FSharp.Core.FSharpOption`1[System.String])
59855985
FSharp.Compiler.Syntax.DebugPointAtBinding+Tags: Int32 NoneAtDo
59865986
FSharp.Compiler.Syntax.DebugPointAtBinding+Tags: Int32 NoneAtInvisible
59875987
FSharp.Compiler.Syntax.DebugPointAtBinding+Tags: Int32 NoneAtLet

0 commit comments

Comments
 (0)