Merged revisions 24573 via svnmerge from

Antonio Cunei · Antonio Cunei · commit eba318ebc4ef · 2011-03-24T18:28:09.000Z
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24573 | dragos | 2011-03-24 18:48:14 +0100 (Thu, 24 Mar 2011) | 1 line Added synchronous version of askStructure, needed by the IDE to avoid deadlocks. review by odersky. ........
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -848,6 +848,14 @@ class Global(settings: Settings, reporter: Reporter)
     }
   }
 
+  /** Synchronous version of askStructure. */
+  def getStructure(source: SourceFile, response: Response[Tree]) {
+    getUnit(source) match {
+      case Some(_) => waitLoadedTyped(source, response)
+      case None => getParsedEntered(source, false, response)
+    }
+  }
+
   /** Implements CompilerControl.askLoadedTyped */
   protected def waitLoadedTyped(source: SourceFile, response: Response[Tree]) {
     getUnit(source) match {

Original file line number	Diff line number	Diff line change
`@@ -848,6 +848,14 @@ class Global(settings: Settings, reporter: Reporter)`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`
	`851`	`+ /** Synchronous version of askStructure. */`
	`852`	`+ def getStructure(source: SourceFile, response: Response[Tree]) {`
	`853`	`+ getUnit(source) match {`
	`854`	`+ case Some(_) => waitLoadedTyped(source, response)`
	`855`	`+ case None => getParsedEntered(source, false, response)`
	`856`	`+ }`
	`857`	`+ }`
	`858`	`+`
`851`	`859`	`/** Implements CompilerControl.askLoadedTyped */`
`852`	`860`	`protected def waitLoadedTyped(source: SourceFile, response: Response[Tree]) {`
`853`	`861`	`getUnit(source) match {`