Skip to content

Commit ef1d8c5

Browse files
committed
Merge remote-tracking branch 'origin/main' into ide-text-editors
2 parents ab1531d + d4e9099 commit ef1d8c5

File tree

11 files changed

+25
-17
lines changed

11 files changed

+25
-17
lines changed
File renamed without changes.
File renamed without changes.

_ja/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ sections:
1414
- title: "入門"
1515
description: "あなたのコンピューターに Scala をインストールして、Scala コードを書きはじめよう!"
1616
icon: "fa fa-rocket"
17-
link: /ja/getting-started/index.html
17+
link: /ja/getting-started/install-scala.html
1818
- title: "Scala ツアー"
1919
description: "コア言語機能をひと口大で紹介"
2020
icon: "fa fa-flag"

_overviews/FAQ/index.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,18 @@ In short, the only officially sanctioned place is the \#jobs channel
6565

6666
### Who's behind Scala?
6767

68-
This is answered [on the community page](https://www.scala-lang.org/community/#whos-behind-scala).
68+
This is answered [on the Governance page](https://www.scala-lang.org/governance/).
6969

7070
### Can I use the Scala logo?
7171

7272
See [scala/scala-lang#1040](https://github.com/scala/scala-lang/issues/1040).
7373

7474
## Technical questions
7575

76+
### What IDEs are available for Scala?
77+
78+
See [this doc page](https://docs.scala-lang.org/getting-started/scala-ides.html).
79+
7680
### What compiler flags are recommended?
7781

7882
The list of available options is
@@ -244,18 +248,22 @@ differ from a function value such as:
244248

245249
val square: Int => Int = x => x * x
246250

247-
For Scala 2, there is a [complete answer on Stack Overflow](https://stackoverflow.com/a/2530007/4111404)
251+
For **Scala 2**, there is a [complete answer on Stack Overflow](https://stackoverflow.com/a/2530007/4111404)
248252
and a [summary with practical differences](https://tpolecat.github.io/2014/06/09/methods-functions.html).
249253

250-
Note that in **Scala 3** the differences are fewer;
251-
for example, they will be able to
252-
[accept implicit parameters]({{ site.scala3ref }}/contextual/context-functions.html)
253-
as well as [type parameters]({{ site.scala3ref }}/new-types/polymorphic-function-types.html).
254-
255-
Nevertheless, it is still recommended to use methods most of the time,
256-
unless you absolutely need a function. And, thanks to
257-
[eta-expansion](https://stackoverflow.com/questions/39445018/what-is-the-eta-expansion-in-scala)
258-
you rarely would need to define a function rather than a method.
254+
In **Scala 3**, the differences are fewer.
255+
[Context functions]({{ site.scala3ref }}/contextual/context-functions.html)
256+
accept given parameters and
257+
[polymorphic functions]({{ site.scala3ref }}/new-types/polymorphic-function-types.html)
258+
have type parameters.
259+
260+
It's standard to use methods most of the time,
261+
except when a function value is actually needed.
262+
[Eta-expansion](https://stackoverflow.com/questions/39445018/what-is-the-eta-expansion-in-scala),
263+
converts methods to functions when needed.
264+
For example, a method such as `map` expects a function,
265+
but even if you `def square` as shown above, you can
266+
still `xs.map(square)`.
259267

260268
### What's the difference between types and classes?
261269

_overviews/contribute/add-guides.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ You must also add the tutorial to the drop-down list in the navigation bar. To d
338338

339339
---
340340
- title: Getting Started
341-
url: "/getting-started/index.html"
341+
url: "/getting-started/install-scala.html"
342342
- title: Learn
343343
...
344344
- title: Tutorials

_overviews/scala-book/preliminaries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ That being said, there are a few good things to know before you read this book.
2121

2222
## Installing Scala
2323

24-
First, to run the examples in this book you’ll need to install Scala on your computer. See our general [Getting Started]({{site.baseurl}}/getting-started/index.html) page for details on how to use Scala (a) in an IDE and (b) from the command line.
24+
First, to run the examples in this book you’ll need to install Scala on your computer. See our general [Getting Started]({{site.baseurl}}/getting-started/install-scala.html) page for details on how to use Scala (a) in an IDE and (b) from the command line.
2525

2626

2727

File renamed without changes.

_ru/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sections:
1111
- title: "Приступая к работе"
1212
description: "Установите Scala на свой компьютер и начните писать код на Scala!"
1313
icon: "fa fa-rocket"
14-
link: /ru/getting-started/index.html
14+
link: /ru/getting-started/install-scala.html
1515
- title: "Тур по Scala"
1616
description: "Вступительный обзор по основным возможностям языка."
1717
icon: "fa fa-flag"

_ru/scala3/book/tools-sbt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,4 +485,4 @@ sbt:HelloScalaTest> test
485485
- [The sbt documentation](https://www.scala-sbt.org/1.x/docs/)
486486
- [The ScalaTest website](https://www.scalatest.org/)
487487

488-
[getting_started]: {{ site.baseurl }}/ru/getting-started/index.html
488+
[getting_started]: {{ site.baseurl }}/ru/getting-started/install-scala.html
File renamed without changes.

_uk/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sections:
1616
- title: "Початок роботи"
1717
description: "Встанови Scala на свій комп'ютер і почни писати код Scala!"
1818
icon: "fa fa-rocket"
19-
link: /uk/getting-started/index.html
19+
link: /uk/getting-started/install-scala.html
2020
- title: "Екскурсія по Скала"
2121
description: "Короткі введення в основні особливості мови."
2222
icon: "fa fa-flag"

0 commit comments

Comments
 (0)