summaryrefslogtreecommitdiff
path: root/test/files/presentation/scope-completion-2.check
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:07:09 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-12-13 10:07:09 -0800
commit1e530365fd3a1ab749091e7c56850405dc98aed1 (patch)
treee98e6e16c5f6fd003ef4c6581fa8a97f215ccfed /test/files/presentation/scope-completion-2.check
parentd614965f083981817bfa08b84a07c069987d0a78 (diff)
parent3bfd83971ec48102fd1e711236f5a313c6a1ce3e (diff)
downloadscala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.gz
scala-1e530365fd3a1ab749091e7c56850405dc98aed1.tar.bz2
scala-1e530365fd3a1ab749091e7c56850405dc98aed1.zip
Merge pull request #3265 from retronym/merge/2.10.x-to-master
Merge 2.10.x to master
Diffstat (limited to 'test/files/presentation/scope-completion-2.check')
-rw-r--r--test/files/presentation/scope-completion-2.check16
1 files changed, 7 insertions, 9 deletions
diff --git a/test/files/presentation/scope-completion-2.check b/test/files/presentation/scope-completion-2.check
index 3a1dbd7cff..d94f7a4b56 100644
--- a/test/files/presentation/scope-completion-2.check
+++ b/test/files/presentation/scope-completion-2.check
@@ -1,12 +1,11 @@
reload: Completions.scala
-askScopeCompletion at Completions.scala(16,4)
+askScopeCompletion at Completions.scala(15,2)
================================================================================
-[response] askScopeCompletion at (16,4)
-retrieved 11 members
+[response] askScopeCompletion at (15,2)
+retrieved 10 members
class Completion1 extends AnyRef
def <init>(): test.Completion1
-def test: Unit
object Completion1
private class Cc1 extends AnyRef
private class Co1 extends AnyRef
@@ -17,19 +16,18 @@ private[this] val vc1: Int
private[this] val vo1: Int
================================================================================
-askScopeCompletion at Completions.scala(32,4)
+askScopeCompletion at Completions.scala(29,2)
================================================================================
-[response] askScopeCompletion at (32,4)
-retrieved 11 members
-[inaccessible] private[this] val vc1: Int
+[response] askScopeCompletion at (29,2)
+retrieved 10 members
class Completion1 extends AnyRef
def <init>(): test.Completion1.type
-def test: Unit
object Completion1
private class Cc1 extends AnyRef
private class Co1 extends AnyRef
private def fc1: Int
private def fo1: Int
private[this] val c: test.Completion1
+private[this] val vc1: Int
private[this] val vo1: Int
================================================================================