Skip to content

Fix extern declaration accessibility #10399

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
vzarytovskii merged 6 commits into from
Nov 7, 2020
Merged

Fix extern declaration accessibility #10399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
931f67d
Keep extern declaration access
auduchinok Nov 6, 2020
3eca1d8
Add test
auduchinok Nov 6, 2020
f1d5071
Simplify test
auduchinok Nov 6, 2020
fcfd224
Check no modifier, explicit public modifier
auduchinok Nov 6, 2020
0bad662
Cleanup
auduchinok Nov 6, 2020
39a7c6f
Fix test
auduchinok Nov 6, 2020
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
Prev Previous commit
Next Next commit
Simplify test
  • Loading branch information
@auduchinok
auduchinok committed Nov 6, 2020
commit f1d507190927ba7e09220f6176772a54b9cbfe25
11 changes: 8 additions & 3 deletions tests/service/Common.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,15 @@ let matchBraces (name: string, code: string) =
let braces = checker.MatchBraces(filePath, FSharp.Compiler.Text.SourceText.ofString code, options) |> Async.RunSynchronously
braces

let parseSourceCodeAndGetModule (source: string) =
match parseSourceCode ("test", source) with
| Some (ParsedInput.ImplFile (ParsedImplFileInput (_, _, _, _, _, [ moduleOrNamespace ], _))) -> moduleOrNamespace

let getSingleModuleLikeDecl (input: ParsedInput option) =
match input with
| Some (ParsedInput.ImplFile (ParsedImplFileInput (modules = [ decl ]))) -> decl
| _ -> failwith "Could not get module decls"

let parseSourceCodeAndGetModule (source: string) =
parseSourceCode ("test", source) |> getSingleModuleLikeDecl


/// Extract range info
let tups (m:Range.range) = (m.StartLine, m.StartColumn), (m.EndLine, m.EndColumn)
Expand Down
11 changes: 4 additions & 7 deletions tests/service/Symbols.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,10 @@ module ExternDeclarations =
let ``Access modifier`` () =
let parseResults, checkResults = getParseAndCheckResults "extern int private f()"

match parseResults.ParseTree with
| Some (ParsedInput.ImplFile (ParsedImplFileInput (modules = [SynModuleOrNamespace (decls = [decl])]))) ->
match decl with
| SynModuleDecl.Let (_, [Binding (accessibility = accessibility)], _) ->
accessibility |> should equal (Some SynAccess.Private)
| _ -> failwith "Couldn't get f"
| _ -> failwith "Couldn't get bindings"
match getSingleModuleLikeDecl parseResults.ParseTree with
| SynModuleOrNamespace (decls = [SynModuleDecl.Let (_, [Binding (accessibility = accessibility)], _)]) ->
accessibility |> should equal (Some SynAccess.Private)
| _ -> failwith "Couldn't get f"

match findSymbolByName "f" checkResults with
| :? FSharpMemberOrFunctionOrValue as mfv -> mfv.Accessibility.IsPrivate |> should equal true
Expand Down