diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
| commit | e1c6dd965aa4249f715bbb2832df182cc5505853 (patch) | |
| tree | 840a092abc16563b9f83b6b3a24556ad91ba67e7 /test/files/presentation/scope-completion-2.check | |
| parent | 18fd31d2b58e6e14cbd49d8e20ba05d05165eb4b (diff) | |
| parent | 0c927046dc5df974e6c39187107cf3548825282b (diff) | |
| download | scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.gz scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.bz2 scala-e1c6dd965aa4249f715bbb2832df182cc5505853.zip | |
Merge commit '0c92704' into merge/2.10.x-to-master
Conflicts:
bincompat-forward.whitelist.conf
src/interactive/scala/tools/nsc/interactive/Global.scala
test/files/presentation/scope-completion-2.check
test/files/presentation/scope-completion-3.check
test/files/presentation/scope-completion-import.check
Conflicts in the scope completion tests handled with the help
of @skyluc in https://github.com/scala/scala/pull/3264
Diffstat (limited to 'test/files/presentation/scope-completion-2.check')
| -rw-r--r-- | test/files/presentation/scope-completion-2.check | 16 |
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 ================================================================================ |