Skip to content

Include attributes in range of SynModuleOrNamespace(Sig). #11483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2021
Merged

Include attributes in range of SynModuleOrNamespace(Sig). #11483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/fsharp/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ fileModuleSpec:
| opt_attributes opt_declVisibility moduleIntro moduleSpfnsPossiblyEmptyBlock
{ if Option.isSome $2 then errorR(Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier(), rhs parseState 2))
let m2 = rhs parseState 3
let m = (rhs2 parseState 1 4)
let mDeclsAndAttrs = (List.map (fun (a: SynAttributeList) -> a.Range) $1) @ (List.map (fun (d: SynModuleSigDecl) -> d.Range) $4)
let m = (m2, mDeclsAndAttrs) ||> unionRangeWithListBy id
let isRec, path2, xml, vis = $3
(fun (isRec2, path, _) ->
if not (isNil path) then errorR(Error(FSComp.SR.parsNamespaceOrModuleNotBoth(), m2))
Expand Down Expand Up @@ -1155,7 +1156,8 @@ fileModuleImpl:
| opt_attributes opt_declVisibility moduleIntro moduleDefnsOrExprPossiblyEmptyOrBlock
{ if Option.isSome $2 then errorR(Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier(), rhs parseState 2))
let m2 = rhs parseState 3
let m = (m2, $4) ||> unionRangeWithListBy (fun modu -> modu.Range)
let mDeclsAndAttrs = (List.map (fun (a: SynAttributeList) -> a.Range) $1) @ (List.map (fun (d: SynModuleDecl) -> d.Range) $4)
let m = (m2, mDeclsAndAttrs) ||> unionRangeWithListBy id
let isRec2, path2, xml, vis = $3
(fun (isRec, path, _) ->
if not (isNil path) then errorR(Error(FSComp.SR.parsNamespaceOrModuleNotBoth(), m2))
Expand Down
34 changes: 34 additions & 0 deletions tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,23 @@ type X = int
assertRange (3, 0) (5, 12) r
| _ -> Assert.Fail "Could not get valid AST"

[<Test>]
let ``Module range should start at first attribute`` () =
let parseResults =
getParseResults
"""
[< Foo >]
module Bar

let s : string = "s"
"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput (modules = [
SynModuleOrNamespace.SynModuleOrNamespace(kind = SynModuleOrNamespaceKind.NamedModule; range = r) ])) ->
assertRange (2, 0) (5, 20) r
| _ -> Assert.Fail "Could not get valid AST"

module SynConsts =
[<Test>]
let ``Measure contains the range of the constant`` () =
Expand Down Expand Up @@ -545,6 +562,23 @@ type Bar = | Bar of string * int
assertRange (3, 0) (5, 32) r
| _ -> Assert.Fail "Could not get valid AST"

[<Test>]
let ``Module range should start at first attribute`` () =
let parseResults =
getParseResultsOfSignatureFile
"""
[< Foo >]
module Bar

val s : string
"""

match parseResults with
| ParsedInput.SigFile (ParsedSigFileInput (modules = [
SynModuleOrNamespaceSig.SynModuleOrNamespaceSig(kind = SynModuleOrNamespaceKind.NamedModule; range = r) ])) ->
assertRange (2, 1) (5, 14) r
| _ -> Assert.Fail "Could not get valid AST"

module SignatureTypes =
[<Test>]
let ``Range of Type should end at end keyword`` () =
Expand Down