diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-02-17 14:19:46 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-02-17 14:19:46 +0000 |
| commit | 8b0df2f59ed93ed028ecc984a9289fdaaaffa027 (patch) | |
| tree | 8a10d5bc92a8a53438e46482f84539f1455ff186 /src | |
| parent | 2e91b45194f8202e4335573706a57128041c336b (diff) | |
| download | scala-8b0df2f59ed93ed028ecc984a9289fdaaaffa027.tar.gz scala-8b0df2f59ed93ed028ecc984a9289fdaaaffa027.tar.bz2 scala-8b0df2f59ed93ed028ecc984a9289fdaaaffa027.zip | |
More fixes for the new IDE
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/IdeSupport.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/IdeSupport.scala b/src/compiler/scala/tools/nsc/IdeSupport.scala index deac9ffbdc..ebe4611888 100644 --- a/src/compiler/scala/tools/nsc/IdeSupport.scala +++ b/src/compiler/scala/tools/nsc/IdeSupport.scala @@ -5,7 +5,7 @@ trait IdeSupport extends Global with symtab.IdeSupport { protected def normalCompile[T](f : => T) : T = f override def unpickleIDEHook : (( => Type) => Type) = f => normalCompile(f) class IdeRun extends Run { - override def compiles(sym : Symbol) : Boolean = throw new Error + override def compiles(sym : Symbol) : Boolean = false // throw new Error override def compileLate(file : AbstractFile) = { // don't bother with any of the phase crap since adapt isn't supported reloadSource(file) diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index a4f70e7c15..b9ce2d8923 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -275,7 +275,8 @@ trait Namers { self: Analyzer => } def applicableTypeParams(owner: Symbol): List[Symbol] = - if (owner.isTerm || owner.isPackageClass) List() + if (inIDE && (owner eq NoSymbol)) List() + else if (owner.isTerm || owner.isPackageClass) List() else applicableTypeParams(owner.owner) ::: owner.typeParams def deSkolemize: TypeMap = new DeSkolemizeMap(applicableTypeParams(context.owner)) |