Skip to content

Commit 75a3df2

Browse files
Merge branch 'master' into ct_ops_expansion
2 parents 762d90e + e94032c commit 75a3df2

File tree

173 files changed

+2529
-671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+2529
-671
lines changed

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
1414

1515
## Minimized code
1616

17+
<!--
18+
This code should be self contained, compilable (with possible failures) and as small as possible.
19+
20+
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
21+
-->
22+
1723
```Scala
1824
println("hello, world")
1925
```

.github/ISSUE_TEMPLATE/crash.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt
1414

1515
## Minimized code
1616

17+
<!--
18+
This code should be self contained, compilable (with possible failures) and as small as possible.
19+
20+
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
21+
-->
22+
1723
```Scala
1824
println("hello, world")
1925
```
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
---
22
name: Syntax highlighting
3-
about: Please create a syntax highlighting issue here https://github.com/scala/vscode-scala-syntax/issues
3+
about: ''
44
title: ''
55
labels: ''
66
assignees: ''
77

88
---
99

10-
Please create a syntax highlighting issue here: [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/issues).
10+
Please create a syntax highlighting issue here
11+
* VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues
12+
* IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D
13+
* highlight.js: https://github.com/highlightjs/highlight.js/issues

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,6 @@
213213
[submodule "community-build/community-projects/scala-java8-compat"]
214214
path = community-build/community-projects/scala-java8-compat
215215
url = https://github.com/dotty-staging/scala-java8-compat.git
216+
[submodule "community-build/community-projects/specs2"]
217+
path = community-build/community-projects/specs2
218+
url = https://github.com/dotty-staging/specs2.git

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Dotty
33
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster)
44
[![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

6-
* [Homepage](http://dotty.epfl.ch)
6+
* [Homepage](https://dotty.epfl.ch)
77
* [Documentation](https://dotty.epfl.ch/docs)
88

99
Try it out
Submodule specs2 added at 0652dae

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,13 @@ object projects:
731731
dependencies = List(scalaJava8Compat, scalatest)
732732
)
733733

734+
lazy val specs2 = SbtCommunityProject(
735+
project = "specs2",
736+
sbtTestCommand = "core/testOnly -- exclude ci",
737+
sbtPublishCommand = "core/publishLocal",
738+
dependencies = List()
739+
)
740+
734741
end projects
735742

736743
def allProjects = List(
@@ -809,6 +816,7 @@ def allProjects = List(
809816
projects.fs2,
810817
projects.libretto,
811818
projects.jacksonModuleScala,
819+
projects.specs2,
812820
)
813821

814822
lazy val projectMap = allProjects.groupBy(_.project)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class CommunityBuildTestC:
9191
@Test def sconfig = projects.sconfig.run()
9292
@Test def shapeless = projects.shapeless.run()
9393
@Test def sourcecode = projects.sourcecode.run()
94+
@Test def specs2 = projects.specs2.run()
9495
@Test def stdLib213 = projects.stdLib213.run()
9596
@Test def ujson = projects.ujson.run()
9697
@Test def upickle = projects.upickle.run()

compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4706,7 +4706,7 @@ object JSCodeGen {
47064706
if (!overloads.isOverloaded)
47074707
overloads.symbol
47084708
else
4709-
overloads.suchThat(_.is(HasDefaultParams)).symbol
4709+
overloads.suchThat(_.is(HasDefaultParams, butNot = Bridge)).symbol
47104710
}
47114711
}
47124712

compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,29 +1410,6 @@ object desugar {
14101410
FunctionWithMods(params, body, Modifiers(mods))
14111411
}
14121412

1413-
/** Add annotation to tree:
1414-
* tree @fullName
1415-
*
1416-
* The annotation is usually represented as a TypeTree referring to the class
1417-
* with the given name `fullName`. However, if the annotation matches a file name
1418-
* that is still to be entered, the annotation is represented as a cascade of `Selects`
1419-
* following `fullName`. This is necessary so that we avoid reading an annotation from
1420-
* the classpath that is also compiled from source.
1421-
*/
1422-
def makeAnnotated(fullName: String, tree: Tree)(using Context): Annotated = {
1423-
val parts = fullName.split('.')
1424-
val ttree = typerPhase match {
1425-
case phase: TyperPhase if phase.stillToBeEntered(parts.last) =>
1426-
val prefix =
1427-
parts.init.foldLeft(Ident(nme.ROOTPKG): Tree)((qual, name) =>
1428-
Select(qual, name.toTermName))
1429-
Select(prefix, parts.last.toTypeName)
1430-
case _ =>
1431-
TypeTree(requiredClass(fullName).typeRef)
1432-
}
1433-
Annotated(tree, New(ttree, Nil))
1434-
}
1435-
14361413
private def derivedValDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(using Context) = {
14371414
val vdef = ValDef(named.name.asTermName, tpt, rhs)
14381415
.withMods(mods)

0 commit comments

Comments
 (0)