Small changes to reflection API to make it safe for IDE use.

* Removed `typeSymbol` and `termSymbol` from `reflect.api.base`, and pushed them down to
  `reflect.api`.
* extracted `TypeTree.symbol` to a top-level method so it can be overridden in other layers

2 files changed, 4 insertions, 15 deletions

diff --git a/src/library/scala/reflect/base/Base.scala b/src/library/scala/reflect/base/Base.scala
index 4457a6cf14..5df48307fe 100644
--- a/src/library/scala/reflect/base/Base.scala
+++ b/src/library/scala/reflect/base/Base.scala
@@ -96,8 +96,8 @@ class Base extends Universe { self =>
 
   // todo. write a decent toString that doesn't crash on recursive types
   class Type extends TypeBase {
-    def typeSymbol: Symbol = NoSymbol
     def termSymbol: Symbol = NoSymbol
+    def typeSymbol: Symbol = NoSymbol
   }
   implicit val TypeTagg = ClassTag[Type](classOf[Type])
 
diff --git a/src/library/scala/reflect/base/Types.scala b/src/library/scala/reflect/base/Types.scala
index 6e8ffc7984..28aaf2d04d 100644
--- a/src/library/scala/reflect/base/Types.scala
+++ b/src/library/scala/reflect/base/Types.scala
@@ -3,25 +3,14 @@ package base
 
 trait Types { self: Universe =>
 
-  /** The base API that all types support */
-  abstract class TypeBase {
-
-    /** The term symbol associated with the type, or `NoSymbol` for types
-     *  that do not refer to a term symbol.
-     */
-    def termSymbol: Symbol
-
-    /** The type symbol associated with the type, or `NoSymbol` for types
-     *  that do not refer to a type symbol.
-     */
-    def typeSymbol: Symbol
-  }
-
   /** The type of Scala types, and also Scala type signatures.
    *  (No difference is internally made between the two).
    */
   type Type >: Null <: TypeBase
 
+  /** The base API that all types support */
+  abstract class TypeBase
+
   /** A tag that preserves the identity of the `Type` abstract type from erasure.
    *  Can be used for pattern matching, instance tests, serialization and likes.
    */