Skip to content

CheckDeclarations: don't report environment for checked top-level module #12865

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 3 commits into from
Mar 25, 2022
Merged

CheckDeclarations: don't report environment for checked top-level module #12865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cfc3db
CheckDeclarations: don't add environment for checked top-level module
auduchinok Mar 22, 2022
dc475f0
Remove test as requested by comment
auduchinok Mar 22, 2022
bd9f700
Add test
auduchinok Mar 23, 2022
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
11 changes: 7 additions & 4 deletions src/fsharp/CheckDeclarations.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,16 @@ let AddLocalSubModule g amap m env (modul: ModuleOrNamespace) =
eNameResEnv = AddModuleOrNamespaceRefToNameEnv g amap m false env.eAccessRights env.eNameResEnv (mkLocalModRef modul)
eUngeneralizableItems = addFreeItemOfModuleTy modul.ModuleOrNamespaceType env.eUngeneralizableItems }
env

/// Add a "module X = ..." definition to the TcEnv and report it to the sink
let AddLocalSubModuleAndReport tcSink scopem g amap m env (modul: ModuleOrNamespace) =
let env = AddLocalSubModule g amap m env modul
CallEnvSink tcSink (scopem, env.NameEnv, env.eAccessRights)
let env = AddLocalSubModule g amap m env modul
if not (equals scopem m) then
// Don't report another environment for top-level module at its own range,
// so it doesn't overwrite inner environment used by features like code completion.
CallEnvSink tcSink (scopem, env.NameEnv, env.eAccessRights)
env

/// Given an inferred module type, place that inside a namespace path implied by a "namespace X.Y.Z" definition
let BuildRootModuleType enclosingNamespacePath (cpath: CompilationPath) mtyp =
(enclosingNamespacePath, (cpath, (mtyp, [])))
Expand Down
3 changes: 3 additions & 0 deletions tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
<Compile Include="..\service\PatternMatchCompilationTests.fs">
<Link>PatternMatchCompilationTests.fs</Link>
</Compile>
<Compile Include="..\service\CompletionTests.fs">
<Link>CompletionTests.fs</Link>
</Compile>
<Compile Include="..\service\ScriptOptionsTests.fs">
<Link>ScriptOptionsTests.fs</Link>
</Compile>
Expand Down
18 changes: 18 additions & 0 deletions tests/service/CompletionTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module FSharp.Compiler.Service.Tests.CompletionTests

open FSharp.Compiler.EditorServices
open FsUnit
open NUnit.Framework

[<Test>]
let ``Expr - record - field 01 - anon module`` () =
let parseResults, checkResults = getParseAndCheckResults """
type Record = { Field: int}

{ Fi }
"""
let lineText = "{ Fi }"
let plid = QuickParse.GetPartialLongNameEx(lineText, 3)
let info = checkResults.GetDeclarationListInfo(Some parseResults, 4, lineText, plid)

info.Items |> Array.exists (fun item -> item.Name = "Field") |> shouldEqual true
42 changes: 0 additions & 42 deletions vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Completion.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,48 +978,6 @@ for i in 0..a."]
printfn "%s" (String.concat "\r\n" code)
AssertCtrlSpaceCompleteContains code marker should ["abs"]

[<Test>]
[<Category("Records")>]
member public this.``Records.WRONG.MissingBindings``() =
// this test should be removed after fixing 279738
let prologue =
[
"type R = {AAA : int; BBB : bool}"
]
let useCases =
[
["let _ = {A = 1; _; }"], "; _;", ["AAA"; "BBB"]
["let _ = {A = 1; _=; }"], " _=;", ["AAA"; "BBB"]
]

for (code, marker, shouldNot) in useCases do
let code = prologue @ code
printfn "running:"
printfn "%s" (String.concat "\r\n" code)
AssertCtrlSpaceCompleteContains code marker [] shouldNot



[<Test>]
[<Category("Records")>]
member public this.``Records.WRONG.IncorrectNameResEnv``() =
// this test should be removed after fixing 279738
let prologue =
[
"type R = {AAA : int; BBB : bool; CCC : int}"
]
let useCases =
[
["let _ = {A}"], "_ = {A", ["AAA"; "BBB"; "CCC"]
["let _ = {AAA = 1; }"], "_ = {AAA = 1;", ["AAA"; "BBB"; "CCC"]
]

for (code, marker, shouldNot) in useCases do
let code = prologue @ code
printfn "running:"
printfn "%s" (String.concat "\r\n" code)
AssertCtrlSpaceCompleteContains code marker [] shouldNot

[<Test>]
[<Category("Records")>]
member public this.``Records.WRONG.ErrorsInFirstBinding``() =
Expand Down