update idea sdk to branch 162

JetBrains · May 23, 2016 · 87f7d86 · 87f7d86
1 parent fe31cfa
commit 87f7d86
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/project/dependencies.scala b/project/dependencies.scala
@@ -4,7 +4,7 @@ import sbt._
 object Versions {
   val scalaVersion = "2.11.6"
   val sbtVersion = "0.13.9"
-  val ideaVersion = "145.970.4"
+  val ideaVersion = "162.74.16"
   val sbtStructureVersion = "5.1.2"
   val luceneVersion = "4.8.1"
   val aetherVersion = "1.0.0.v20140518"

diff --git a/...ins/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala b/...ins/plugins/scala/lang/refactoring/introduceParameter/ScalaIntroduceParameterDialog.scala
@@ -30,7 +30,7 @@ class ScalaIntroduceParameterDialog(project: Project,
         extends ScalaChangeSignatureDialog(project, method) {
 
   private var paramNameField: EditorTextField = _
-  private var typeCombobox: ComboBox = _
+  private var typeCombobox: ComboBox[String] = _
   private var typeMap: util.LinkedHashMap[String, ScType] = _
   private var replaceOccurrencesChb: JCheckBox = _
   private var defaultValuesUsagePanel: DefaultValuesUsagePanel = _

diff --git a/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala b/test/org/jetbrains/plugins/scala/debugger/ScalaDebuggerTestCase.scala
@@ -171,7 +171,7 @@ abstract class ScalaDebuggerTestCase extends ScalaDebuggerTestBase {
     val semaphore = new Semaphore()
     semaphore.down()
     getDebugProcess.getManagerThread.invokeAndWait(new DebuggerContextCommandImpl(ctx) {
-      def threadAction() {
+      override def threadAction() {
         result = callback
         semaphore.up()
       }