Skip to content

Commit e835dc0

Browse files
committed
Fix typo and update semanticdb.expect
1 parent 5b04553 commit e835dc0

File tree

2 files changed

+9
-73
lines changed

2 files changed

+9
-73
lines changed

library/src/scala/annotation/capability.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scala.annotation
22

3-
/** Marks an annotated class as a capabulity.
3+
/** Marks an annotated class as a capability.
44
* If the annotation is present and -Ycc is set, any (possibly aliased
55
* or refined) instance of the class type is implicitly augmented with
66
* the universal capture set. Example

tests/semanticdb/metac.expect

+8-72
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ Text => empty
359359
Language => Scala
360360
Symbols => 14 entries
361361
Occurrences => 30 entries
362-
Synthetics => 2 entries
363362

364363
Symbols:
365364
example/Anonymous# => class Anonymous extends Object { self: Anonymous & Anonymous => +6 decls }
@@ -409,10 +408,6 @@ Occurrences:
409408
[18:6..18:9): foo <- example/Anonymous#foo.
410409
[18:16..18:19): Foo -> example/Anonymous#Foo#
411410

412-
Synthetics:
413-
[10:2..10:9):locally => *[Unit]
414-
[13:2..13:9):locally => *[Unit]
415-
416411
expect/AnonymousGiven.scala
417412
---------------------------
418413

@@ -447,7 +442,6 @@ Text => empty
447442
Language => Scala
448443
Symbols => 109 entries
449444
Occurrences => 113 entries
450-
Synthetics => 2 entries
451445

452446
Symbols:
453447
classes/C1# => final class C1 extends AnyVal { self: C1 => +2 decls }
@@ -675,10 +669,6 @@ Occurrences:
675669
[53:4..53:9): local -> local4
676670
[53:10..53:11): + -> scala/Int#`+`(+4).
677671

678-
Synthetics:
679-
[51:16..51:27):List(1).map => *[Int]
680-
[51:16..51:20):List => *.apply[Int]
681-
682672
expect/Empty.scala
683673
------------------
684674

@@ -896,7 +886,7 @@ Text => empty
896886
Language => Scala
897887
Symbols => 181 entries
898888
Occurrences => 148 entries
899-
Synthetics => 10 entries
889+
Synthetics => 8 entries
900890

901891
Symbols:
902892
_empty_/Enums. => final object Enums extends Object { self: Enums.type => +30 decls }
@@ -1239,8 +1229,6 @@ Synthetics:
12391229
[52:31..52:50):identity[Option[B]] => *[Function1[A, Option[B]]]
12401230
[54:14..54:18):Some => *.apply[Some[Int]]
12411231
[54:14..54:34):Some(Some(1)).unwrap => *(given_<:<_T_T[Option[Int]])
1242-
[54:19..54:23):Some => *.apply[Int]
1243-
[54:28..54:34):unwrap => *[Some[Int], Int]
12441232
[56:52..56:64):Enum[Planet] => *[Planet]
12451233

12461234
expect/EtaExpansion.scala
@@ -1253,7 +1241,7 @@ Text => empty
12531241
Language => Scala
12541242
Symbols => 3 entries
12551243
Occurrences => 8 entries
1256-
Synthetics => 5 entries
1244+
Synthetics => 1 entries
12571245

12581246
Symbols:
12591247
example/EtaExpansion# => class EtaExpansion extends Object { self: EtaExpansion => +1 decls }
@@ -1271,11 +1259,7 @@ Occurrences:
12711259
[4:25..4:26): + -> java/lang/String#`+`().
12721260

12731261
Synthetics:
1274-
[3:2..3:13):Some(1).map => *[Int]
1275-
[3:2..3:6):Some => *.apply[Int]
1276-
[3:14..3:22):identity => *[Int]
12771262
[4:2..4:18):List(1).foldLeft => *[String]
1278-
[4:2..4:6):List => *.apply[Int]
12791263

12801264
expect/Example.scala
12811265
--------------------
@@ -1425,7 +1409,7 @@ Text => empty
14251409
Language => Scala
14261410
Symbols => 13 entries
14271411
Occurrences => 52 entries
1428-
Synthetics => 6 entries
1412+
Synthetics => 2 entries
14291413

14301414
Symbols:
14311415
example/ForComprehension# => class ForComprehension extends Object { self: ForComprehension => +1 decls }
@@ -1497,10 +1481,6 @@ Occurrences:
14971481
[41:6..41:7): f -> local10
14981482

14991483
Synthetics:
1500-
[4:9..4:13):List => *.apply[Int]
1501-
[5:9..5:13):List => *.apply[Int]
1502-
[10:9..10:13):List => *.apply[Int]
1503-
[11:9..11:13):List => *.apply[Int]
15041484
[19:9..19:13):List => *.apply[Tuple2[Int, Int]]
15051485
[33:9..33:13):List => *.apply[Tuple4[Int, Int, Int, Int]]
15061486

@@ -1514,7 +1494,6 @@ Text => empty
15141494
Language => Scala
15151495
Symbols => 29 entries
15161496
Occurrences => 65 entries
1517-
Synthetics => 3 entries
15181497

15191498
Symbols:
15201499
a/b/Givens. => final object Givens extends Object { self: Givens.type => +12 decls }
@@ -1614,11 +1593,6 @@ Occurrences:
16141593
[26:57..26:58): A -> a/b/Givens.foo().(A)
16151594
[26:59..26:64): empty -> a/b/Givens.Monoid#empty().
16161595

1617-
Synthetics:
1618-
[12:17..12:25):sayHello => *[Int]
1619-
[13:19..13:29):sayGoodbye => *[Int]
1620-
[14:18..14:27):saySoLong => *[Int]
1621-
16221596
expect/ImplicitConversion.scala
16231597
-------------------------------
16241598

@@ -2018,7 +1992,6 @@ Text => empty
20181992
Language => Scala
20191993
Symbols => 6 entries
20201994
Occurrences => 10 entries
2021-
Synthetics => 1 entries
20221995

20231996
Symbols:
20241997
example/Local# => class Local extends Object { self: Local => +2 decls }
@@ -2040,9 +2013,6 @@ Occurrences:
20402013
[4:25..4:26): a -> local1
20412014
[5:4..5:6): id -> local2
20422015

2043-
Synthetics:
2044-
[5:4..5:6):id => *[Int]
2045-
20462016
expect/Locals.scala
20472017
-------------------
20482018

@@ -2053,7 +2023,6 @@ Text => empty
20532023
Language => Scala
20542024
Symbols => 3 entries
20552025
Occurrences => 6 entries
2056-
Synthetics => 1 entries
20572026

20582027
Symbols:
20592028
local0 => val local x: Int
@@ -2222,7 +2191,7 @@ Text => empty
22222191
Language => Scala
22232192
Symbols => 3 entries
22242193
Occurrences => 80 entries
2225-
Synthetics => 2 entries
2194+
Synthetics => 1 entries
22262195

22272196
Symbols:
22282197
example/MethodUsages# => class MethodUsages extends Object { self: MethodUsages => +2 decls }
@@ -2312,7 +2281,6 @@ Occurrences:
23122281
[34:8..34:9): m -> example/Methods#m17.m().
23132282

23142283
Synthetics:
2315-
[13:2..13:6):m.m7 => *[Int]
23162284
[13:2..13:26):m.m7(m, new m.List[Int]) => *(Int)
23172285

23182286
expect/Methods.scala
@@ -3165,7 +3133,7 @@ Text => empty
31653133
Language => Scala
31663134
Symbols => 52 entries
31673135
Occurrences => 132 entries
3168-
Synthetics => 36 entries
3136+
Synthetics => 23 entries
31693137

31703138
Symbols:
31713139
example/Synthetic# => class Synthetic extends Object { self: Synthetic => +23 decls }
@@ -3356,26 +3324,17 @@ Occurrences:
33563324
[58:6..58:9): foo -> example/Synthetic#Contexts.foo().
33573325

33583326
Synthetics:
3359-
[5:2..5:13):List(1).map => *[Int]
3360-
[5:2..5:6):List => *.apply[Int]
33613327
[6:2..6:18):Array.empty[Int] => intArrayOps(*)
33623328
[7:2..7:8):"fooo" => augmentString(*)
33633329
[10:13..10:24):"name:(.*)" => augmentString(*)
3364-
[11:17..11:25):LazyList => *.apply[Int]
3365-
[13:4..13:28):#:: 2 #:: LazyList.empty => *[Int]
33663330
[13:8..13:28):2 #:: LazyList.empty => toDeferrer[Int](*)
3367-
[13:10..13:28):#:: LazyList.empty => *[Int]
33683331
[13:14..13:28):LazyList.empty => toDeferrer[Nothing](*)
33693332
[13:14..13:28):LazyList.empty => *[Nothing]
3370-
[15:25..15:33):LazyList => *.apply[Int]
3371-
[17:14..17:38):#:: 2 #:: LazyList.empty => *[Int]
33723333
[17:18..17:38):2 #:: LazyList.empty => toDeferrer[Int](*)
3373-
[17:20..17:38):#:: LazyList.empty => *[Int]
33743334
[17:24..17:38):LazyList.empty => toDeferrer[Nothing](*)
33753335
[17:24..17:38):LazyList.empty => *[Nothing]
33763336
[19:12..19:13):1 => intWrapper(*)
33773337
[19:26..19:27):0 => intWrapper(*)
3378-
[19:46..19:50):x -> => *[Int]
33793338
[19:46..19:47):x => ArrowAssoc[Int](*)
33803339
[20:12..20:13):1 => intWrapper(*)
33813340
[20:26..20:27):0 => intWrapper(*)
@@ -3384,10 +3343,6 @@ Synthetics:
33843343
[32:35..32:49):Array.empty[T] => *(evidence$1)
33853344
[36:22..36:27):new F => orderingToOrdered[F](*)
33863345
[36:22..36:27):new F => *(ordering)
3387-
[40:9..40:43):scala.concurrent.Future.successful => *[Int]
3388-
[41:9..41:43):scala.concurrent.Future.successful => *[Int]
3389-
[44:9..44:43):scala.concurrent.Future.successful => *[Int]
3390-
[45:9..45:43):scala.concurrent.Future.successful => *[Int]
33913346
[51:24..51:30):foo(0) => *(x$1)
33923347
[52:27..52:33):foo(0) => *(x)
33933348
[55:6..55:12):foo(x) => *(x)
@@ -3471,7 +3426,7 @@ Text => empty
34713426
Language => Scala
34723427
Symbols => 22 entries
34733428
Occurrences => 46 entries
3474-
Synthetics => 7 entries
3429+
Synthetics => 2 entries
34753430

34763431
Symbols:
34773432
example/ValPattern# => class ValPattern extends Object { self: ValPattern => +14 decls }
@@ -3546,13 +3501,8 @@ Occurrences:
35463501
[40:10..40:18): rightVar -> local4
35473502

35483503
Synthetics:
3549-
[6:4..6:8):Some => *.apply[Int]
35503504
[8:6..8:10):List => *.unapplySeq[Nothing]
35513505
[8:11..8:15):Some => *.unapply[Nothing]
3552-
[12:4..12:8):Some => *.apply[Int]
3553-
[25:4..25:11):locally => *[Unit]
3554-
[28:8..28:12):Some => *.apply[Int]
3555-
[32:8..32:12):Some => *.apply[Int]
35563506

35573507
expect/Vals.scala
35583508
-----------------
@@ -4171,7 +4121,6 @@ Text => empty
41714121
Language => Scala
41724122
Symbols => 3 entries
41734123
Occurrences => 6 entries
4174-
Synthetics => 1 entries
41754124

41764125
Symbols:
41774126
example/`local-file`# => class local-file extends Object { self: local-file => +1 decls }
@@ -4186,9 +4135,6 @@ Occurrences:
41864135
[5:4..5:9): local -> local0
41874136
[5:10..5:11): + -> scala/Int#`+`(+4).
41884137

4189-
Synthetics:
4190-
[3:2..3:9):locally => *[Int]
4191-
41924138
expect/nullary.scala
41934139
--------------------
41944140

@@ -4199,7 +4145,6 @@ Text => empty
41994145
Language => Scala
42004146
Symbols => 17 entries
42014147
Occurrences => 29 entries
4202-
Synthetics => 1 entries
42034148

42044149
Symbols:
42054150
_empty_/Concrete# => class Concrete extends NullaryTest[Int, List] { self: Concrete => +3 decls }
@@ -4251,9 +4196,6 @@ Occurrences:
42514196
[18:7..18:15): Concrete -> _empty_/Concrete#
42524197
[18:17..18:25): nullary3 -> _empty_/Concrete#nullary3().
42534198

4254-
Synthetics:
4255-
[13:17..13:21):List => *.apply[Int]
4256-
42574199
expect/recursion.scala
42584200
----------------------
42594201

@@ -4542,7 +4484,6 @@ Text => empty
45424484
Language => Scala
45434485
Symbols => 144 entries
45444486
Occurrences => 225 entries
4545-
Synthetics => 1 entries
45464487

45474488
Symbols:
45484489
local0 => abstract method k => Int
@@ -4917,9 +4858,6 @@ Occurrences:
49174858
[119:32..119:38): Option -> scala/Option#
49184859
[119:39..119:42): Int -> scala/Int#
49194860

4920-
Synthetics:
4921-
[68:20..68:24):@ann => *[Int]
4922-
49234861
expect/semanticdb-extract.scala
49244862
-------------------------------
49254863

@@ -4930,7 +4868,7 @@ Text => empty
49304868
Language => Scala
49314869
Symbols => 18 entries
49324870
Occurrences => 20 entries
4933-
Synthetics => 3 entries
4871+
Synthetics => 2 entries
49344872

49354873
Symbols:
49364874
_empty_/AnObject. => final object AnObject extends Object { self: AnObject.type => +6 decls }
@@ -4975,7 +4913,6 @@ Occurrences:
49754913
[16:20..16:23): Int -> scala/Int#
49764914

49774915
Synthetics:
4978-
[11:2..11:6):List => *.apply[Int]
49794916
[12:2..12:12):List.apply => *[Nothing]
49804917
[13:2..13:14):List.`apply` => *[Nothing]
49814918

@@ -4989,7 +4926,7 @@ Text => empty
49894926
Language => Scala
49904927
Symbols => 18 entries
49914928
Occurrences => 43 entries
4992-
Synthetics => 2 entries
4929+
Synthetics => 1 entries
49934930

49944931
Symbols:
49954932
_empty_/MyProgram# => final class MyProgram extends Object { self: MyProgram => +2 decls }
@@ -5057,6 +4994,5 @@ Occurrences:
50574994
[7:30..7:33): foo -> _empty_/toplevel$package.foo().
50584995

50594996
Synthetics:
5060-
[5:40..5:60):(1 to times) foreach => *[Unit]
50614997
[5:41..5:42):1 => intWrapper(*)
50624998

0 commit comments

Comments
 (0)