Skip to content

Commit f11c8ff

Browse files
committed
do not register compiler generated definitions
1 parent db2e922 commit f11c8ff

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package example
2-
2+
/*
33
class CaseTest {
44
def foo (x: Option[Int]) : Int =
55
x match {
66
case y @ Some(x) => x
77
case None => 0
88
}
99
}
10-
10+
*/
1111
case class CaseClass(x: Int)
12-
case object CaseObject
12+
//case object CaseObject

semanticdb/input/src/main/scala/example/Example.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Example {
1515
y
1616
)
1717
}
18-
18+
/*
1919
class ExampleInit {
2020
21-
}
21+
}*/

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
416416
// We want to add symbols coming from our file
417417
// if (symbol.pos.sourceFile != sourceFile) return
418418
if (symbol_path == "" || symbol.isUselessOccurrence) return
419+
if (symbol.flags.is(Flags.Synthetic) && type_symbol == s.SymbolOccurrence.Role.DEFINITION) return
419420

420421
val key = (symbol_path, range)
421422
// TODO: refactor the following
@@ -430,7 +431,7 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
430431
}
431432
println(symbol_path,
432433
range,
433-
symbol.owner.flags,
434+
symbol.flags,
434435
is_global,
435436
iterateParent(symbol))
436437
occurrences =
@@ -583,17 +584,18 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
583584
case TypeTree.Select(qualifier, _) => {
584585
val typetree = extractTypeTree(tree)
585586
val range = rangeSelect(typetree.symbol.trueName, typetree.pos)
587+
println(typetree.pos.start, typetree.pos.end)
586588
addOccurenceTypeTree(typetree,
587589
s.SymbolOccurrence.Role.REFERENCE,
588590
range)
589591
super.traverseTypeTree(typetree)
590-
}
592+
}/*
591593
case TypeTree.Inferred() => {
592594
val typetree = extractTypeTree(tree)
593595
addOccurenceTypeTree(typetree,
594596
s.SymbolOccurrence.Role.REFERENCE,
595597
posToRange(typetree.pos).get)
596-
}
598+
}*/
597599
case _ => {
598600
super.traverseTypeTree(tree)
599601
}
@@ -829,7 +831,10 @@ class SemanticdbConsumer(sourceFile: java.nio.file.Path) extends TastyConsumer {
829831
}
830832

831833
}
834+
println("{--------------------------------------}")
832835
println(root)
836+
println("{--------------------------------------}")
837+
833838
Traverser.traverseTree(root)(reflect.rootContext)
834839
}
835840

semanticdb/test/dotty/semanticdb/Tests.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,5 +212,8 @@ class Tests {
212212
//@Test def testSynthetic(): Unit = checkFile("example/Synthetic.scala")
213213
//@Test def testBinaryOp(): Unit = checkFile("example/BinaryOp.scala")
214214
//@Test def testAnonymous(): Unit = checkFile("example/Anonymous.scala")
215-
@Test def testDottyPredef(): Unit = checkFile("example/DottyPredef.scala")
215+
//@Test def testDottyPredef(): Unit = checkFile("example/DottyPredef.scala")
216+
@Test def testCase(): Unit = checkFile("example/Case.scala")
217+
218+
216219
}

vscode-dotty/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)