enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-09-21 01:57:17 +03:00
Code Issues Projects Releases Wiki Activity

Autoscoping should not escape True and False (#9797)

Browse Source 
close #9765

Changelog:
- fix: do not use autoscope syntax for Boolean constructors
This commit is contained in:
Dmitry Bushev 2024-05-03 11:29:02 +01:00 committed by GitHub
parent a4085346f1
commit 6d605a5926
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 87 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala
View File

@ -1,3 +1,5 @@
package org.enso.compiler.test.context
import org.enso.compiler.suggestions.SuggestionBuilder
import org.enso.compiler.core.ir.Module
import org.enso.interpreter.runtime
@ -955,6 +957,85 @@ class SuggestionBuilderTest extends AnyWordSpecLike with Matchers {
)
}
"build autoscope tagValues for Boolean" in {
val code =
"""from Standard.Base import all
|
|type Value
| A
| B
|
|foo (a : Value | Boolean) = a
|""".stripMargin
val module = code.preprocessModule
build(code, module) shouldEqual Tree.Root(
Vector(
ModuleNode,
Tree.Node(
Suggestion.Type(
externalId = None,
module = "Unnamed.Test",
name = "Value",
params = Seq(),
returnType = "Unnamed.Test.Value",
parentType = Some(SuggestionBuilder.Any),
documentation = None
),
Vector()
),
Tree.Node(
Suggestion.Constructor(
externalId = None,
module = "Unnamed.Test",
name = "A",
arguments = Seq(),
returnType = "Unnamed.Test.Value",
documentation = None,
annotations = Seq()
),
Vector()
),
Tree.Node(
Suggestion.Constructor(
externalId = None,
module = "Unnamed.Test",
name = "B",
arguments = Seq(),
returnType = "Unnamed.Test.Value",
documentation = None,
annotations = Seq()
),
Vector()
),
Tree.Node(
Suggestion.DefinedMethod(
externalId = None,
module = "Unnamed.Test",
name = "foo",
arguments = Seq(
Suggestion.Argument(
"a",
"Unnamed.Test.Value | Standard.Base.Data.Boolean.Boolean",
false,
false,
None,
Some(Seq("..A", "..B", "True", "False"))
)
),
selfType = "Unnamed.Test",
returnType = SuggestionBuilder.Any,
isStatic = true,
documentation = None,
annotations = Seq()
),
Vector()
)
)
)
}
"build argument tag values from ascribed type and type signature" in {
val code =
@ -1536,8 +1617,8 @@ class SuggestionBuilderTest extends AnyWordSpecLike with Matchers {
Some("Boolean.True"),
Some(
List(
"..True",
"..False"
"True",
"False"
)
)
)

6
engine/runtime-suggestions/src/main/scala/org/enso/compiler/suggestions/SuggestionBuilder.scala
View File

@ -660,8 +660,10 @@ final class SuggestionBuilder[A: IndexedSource](
Identifier.Qualified(name)
def mkAutoScopeCall(identifier: Identifier): String =
identifier match {
case Identifier.Qualified(name) => name.toString
case Identifier.Unqualified(name) => s"..$name"
case Identifier.Qualified(name) => name.toString
case Identifier.Unqualified("True") => "True"
case Identifier.Unqualified("False") => "False"
case Identifier.Unqualified(name) => s"..$name"
}
def mkCall(identifier: Identifier): String =
identifier match {