summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-26 13:19:41 -0800
committerPaul Phillips <paulp@improving.org>2012-01-26 13:22:35 -0800
commit9b9fb2cad46041c6cf101ec436b643e3e922bd35 (patch)
treeccc529d6cc47ff759bdc6a13e6c8e3222dd9fdcc
parent67420a8fa31c4570542450238b97e5ca1b54a86f (diff)
downloadscala-9b9fb2cad46041c6cf101ec436b643e3e922bd35.tar.gz
scala-9b9fb2cad46041c6cf101ec436b643e3e922bd35.tar.bz2
scala-9b9fb2cad46041c6cf101ec436b643e3e922bd35.zip
Disabled "not found" suggestions.
The benchmarks charts are confusing me and I want to rule it out as a problem by not having it exist for a while.
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala4
-rw-r--r--test/files/neg/nopredefs.check2
-rw-r--r--test/files/neg/suggest-similar.check6
-rw-r--r--test/files/neg/t2870.check2
4 files changed, 9 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 8af8bbc6ca..6ee09d064f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -171,6 +171,8 @@ trait ContextErrors {
NormalTypeError(tree, "reference to " + name + " is ambiguous;\n" + msg)
def SymbolNotFoundError(tree: Tree, name: Name, owner: Symbol, startingIdentCx: Context) = {
+ /*** Disabled pending investigation of performance impact.
+
// This laborious determination arrived at to keep the tests working.
val calcSimilar = (
name.length > 2 && (
@@ -196,6 +198,8 @@ trait ContextErrors {
similarString("" + name, allowedStrings)
}
}
+ */
+ val similar = ""
NormalTypeError(tree, "not found: "+decodeWithKind(name, owner) + similar)
}
diff --git a/test/files/neg/nopredefs.check b/test/files/neg/nopredefs.check
index e6c1af78a0..0a0ab34482 100644
--- a/test/files/neg/nopredefs.check
+++ b/test/files/neg/nopredefs.check
@@ -1,4 +1,4 @@
-nopredefs.scala:5: error: not found: value Set (similar: Seq)
+nopredefs.scala:5: error: not found: value Set
val y = Set(3)
^
one error found
diff --git a/test/files/neg/suggest-similar.check b/test/files/neg/suggest-similar.check
index 0a858aaf2e..057aa8b250 100644
--- a/test/files/neg/suggest-similar.check
+++ b/test/files/neg/suggest-similar.check
@@ -1,10 +1,10 @@
-suggest-similar.scala:8: error: not found: value flippitx (similar: flippity)
+suggest-similar.scala:8: error: not found: value flippitx
flippitx = 123
^
-suggest-similar.scala:9: error: not found: value identiyt (similar: identity)
+suggest-similar.scala:9: error: not found: value identiyt
Nil map identiyt
^
-suggest-similar.scala:10: error: not found: type Bingus (similar: Dingus)
+suggest-similar.scala:10: error: not found: type Bingus
new Bingus
^
three errors found
diff --git a/test/files/neg/t2870.check b/test/files/neg/t2870.check
index ab962d48c8..99522eca65 100644
--- a/test/files/neg/t2870.check
+++ b/test/files/neg/t2870.check
@@ -1,4 +1,4 @@
-t2870.scala:1: error: not found: type Jar (similar: Jars)
+t2870.scala:1: error: not found: type Jar
class Jars(jar: Jar)
^
t2870.scala:4: error: encountered unrecoverable cycle resolving import.