summaryrefslogtreecommitdiff
path: root/test/files/presentation
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2012-05-08 16:07:15 +0200
committerIulian Dragos <jaguarul@gmail.com>2012-05-08 17:06:49 +0200
commit2e8029b127699ecd8ed1f55456faa345bd88c5ee (patch)
tree446e90390c05750e7bb0de4adfa4acafce7292d5 /test/files/presentation
parentf9410256d97d8b8001e96291016d25f020013784 (diff)
downloadscala-2e8029b127699ecd8ed1f55456faa345bd88c5ee.tar.gz
scala-2e8029b127699ecd8ed1f55456faa345bd88c5ee.tar.bz2
scala-2e8029b127699ecd8ed1f55456faa345bd88c5ee.zip
Fixed positions in named default applications (no hyperlinking in conjunction with implicit arguments).
Removed even more code in the presentation compiler testing infrastructure. One less level of indirection, and a top-level object gone!
Diffstat (limited to 'test/files/presentation')
-rw-r--r--test/files/presentation/hyperlinks.check (renamed from test/files/presentation/patmat.check)12
-rw-r--r--test/files/presentation/hyperlinks.flags (renamed from test/files/presentation/patmat.flags)0
-rw-r--r--test/files/presentation/hyperlinks/Runner.scala (renamed from test/files/presentation/patmat/Runner.scala)0
-rw-r--r--test/files/presentation/hyperlinks/src/NameDefaultTests.scala16
-rw-r--r--test/files/presentation/hyperlinks/src/PatMatTests.scala (renamed from test/files/presentation/patmat/src/PatMatTests.scala)0
5 files changed, 27 insertions, 1 deletions
diff --git a/test/files/presentation/patmat.check b/test/files/presentation/hyperlinks.check
index 29fd8b8e68..85d295dd7d 100644
--- a/test/files/presentation/patmat.check
+++ b/test/files/presentation/hyperlinks.check
@@ -1,4 +1,14 @@
-reload: PatMatTests.scala
+reload: NameDefaultTests.scala, PatMatTests.scala
+
+askHyperlinkPos for `someOtherInt` at (14,24) NameDefaultTests.scala
+================================================================================
+[response] found askHyperlinkPos for `someOtherInt` at (12,9) NameDefaultTests.scala
+================================================================================
+
+askHyperlinkPos for `someString` at (14,45) NameDefaultTests.scala
+================================================================================
+[response] found askHyperlinkPos for `someString` at (3,7) NameDefaultTests.scala
+================================================================================
askHyperlinkPos for `CaseOne` at (12,18) PatMatTests.scala
================================================================================
diff --git a/test/files/presentation/patmat.flags b/test/files/presentation/hyperlinks.flags
index dc13682c5e..dc13682c5e 100644
--- a/test/files/presentation/patmat.flags
+++ b/test/files/presentation/hyperlinks.flags
diff --git a/test/files/presentation/patmat/Runner.scala b/test/files/presentation/hyperlinks/Runner.scala
index 3d19f2d948..3d19f2d948 100644
--- a/test/files/presentation/patmat/Runner.scala
+++ b/test/files/presentation/hyperlinks/Runner.scala
diff --git a/test/files/presentation/hyperlinks/src/NameDefaultTests.scala b/test/files/presentation/hyperlinks/src/NameDefaultTests.scala
new file mode 100644
index 0000000000..b218040fe3
--- /dev/null
+++ b/test/files/presentation/hyperlinks/src/NameDefaultTests.scala
@@ -0,0 +1,16 @@
+
+class NameDefaults {
+ val someString = "abc"
+ val someInt = 42
+
+ def foo(x: String, y: Int)(implicit logger: Int): Int = y
+
+ implicit val l = 42
+
+ def bar {
+ println()
+ val someOtherInt = 10
+
+ foo(y = someOtherInt/*#*/, x = someString/*#*/)
+ }
+}
diff --git a/test/files/presentation/patmat/src/PatMatTests.scala b/test/files/presentation/hyperlinks/src/PatMatTests.scala
index bbd0f2e7ed..bbd0f2e7ed 100644
--- a/test/files/presentation/patmat/src/PatMatTests.scala
+++ b/test/files/presentation/hyperlinks/src/PatMatTests.scala