Auto-merge with tag build-0.11.335

Conflicts:
	update_dependencies.xml

idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt

@@ -16,18 +16,20 @@
 
 package org.jetbrains.kotlin.android
 
-import com.android.ide.common.blame.output.GradleMessage
-import com.android.ide.common.blame.parser.PatternAwareOutputParser
-import com.android.ide.common.blame.parser.util.OutputLineReader
-import com.android.utils.ILogger
+import com.android.tools.idea.gradle.output.GradleMessage
+import com.android.tools.idea.gradle.output.parser.OutputLineReader
+import com.android.tools.idea.gradle.output.parser.ParsingFailedException
+import com.android.tools.idea.gradle.output.parser.PatternAwareOutputParser
 import com.intellij.openapi.util.io.FileUtilRt
 import com.intellij.openapi.util.text.StringUtil
+
 import java.io.File
+import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 public class KotlinOutputParser : PatternAwareOutputParser {
 
-    override fun parse(line: String, reader: OutputLineReader, messages: MutableList<GradleMessage>, logger: ILogger): Boolean {
+    override fun parse(line: String, reader: OutputLineReader, messages: MutableList<GradleMessage>): Boolean {
         val colonIndex1 = line.colon()
         val severity = if (colonIndex1 >= 0) line.substringBeforeAndTrim(colonIndex1).parseSeverity() else null
         if (severity == null) return false

idea/src/META-INF/plugin.xml

@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
 
-  <idea-version since-build="141.2" until-build="141.9999"/>
+  <idea-version since-build="140.2683" until-build="140.9999"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
@@ -448,7 +448,6 @@
     <definitionsScopedSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinDefinitionsSearcher"/>
     <annotatedElementsSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinAnnotatedElementsSearcher"/>
     <methodReferencesSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinLightPropertyAccessorsReferenceSearcher"/>
-    <methodReferencesSearch implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinConstructorDelegationCallReferenceSearcher"/>
 
     <exceptionFilter implementation="org.jetbrains.kotlin.idea.filters.JetExceptionFilterFactory" order="first"/>
 
@@ -823,11 +822,6 @@
       <category>Kotlin</category>
     </intentionAction>
 
-    <intentionAction>
-      <className>org.jetbrains.kotlin.idea.intentions.InvertIfConditionIntention</className>
-      <category>Kotlin</category>
-    </intentionAction>
-
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.ExplicitGetInspection"
         displayName="Explicit 'get'"
         groupName="Kotlin"
@@ -870,13 +864,6 @@
         level="WARNING"
         />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedReceiverParameterInspection"
-        displayName="Unused receiver parameter"
-        groupName="Kotlin"
-        enabledByDefault="true"
-        level="WARNING"
-        />
-
     <localInspection implementationClass="org.jetbrains.kotlin.idea.kdoc.KDocUnresolvedReferenceInspection"
         displayName="Unresolved reference in KDoc"
         groupName="Kotlin"

update_dependencies.xml

@@ -1,5 +1,5 @@
 <project name="Update Dependencies" default="update">
-    <property name="ideaVersion" value="141.177.4"/>
+    <property name="ideaVersion" value="140.2683.2"/>
 
     <condition property="os.tag" value="win.zip">
         <os family="windows"/>