Add build-artifacts target to satisfy updated build configuration

.idea/artifacts/instrumentation_jar.xml

@@ -4,7 +4,7 @@
     <root id="archive" name="instrumentation.jar">
       <element id="module-output" name="instrumentation" />
       <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/jetbrains-asm-debug-all-4.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/guava-14.0.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

.idea/libraries/guava.xml

@@ -4,11 +4,11 @@
       <root url="file://$PROJECT_DIR$/annotations" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/guava-14.0.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/guava-17.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-14.0.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/idea_full.xml

@@ -250,7 +250,7 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-production" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/jps-standalone-builder/java-production" />
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-14.0.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
       <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/structure-view-api/src" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/platform/structure-view-impl/src" />

.idea/libraries/intellij_core.xml

@@ -252,7 +252,7 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/jps-standalone-builder/java-production" />
       <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/dependencies/guava-14.0.1-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/guava-17.0-sources.jar!/" />
       <root url="jar://$PROJECT_DIR$/dependencies/asm5-src.zip!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />

build.xml

@@ -642,4 +642,6 @@
         </zip>
         <echo message="##teamcity[publishArtifacts '${output.relative}/${output.name}.zip']"/>
     </target>
+
+    <target name="build-artifacts" depends="zip"/>
 </project>

idea/src/META-INF/plugin.xml

@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="138.515" until-build="138.9999"/>
+  <idea-version since-build="138.977" until-build="138.9999"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>

idea/src/org/jetbrains/jet/plugin/completion/weigher/JetCompletionSorting.kt

@@ -22,8 +22,9 @@ import com.intellij.codeInsight.completion.CompletionSorter
 import org.jetbrains.jet.lang.psi.JetFile
 import com.intellij.codeInsight.lookup.LookupElementWeigher
 import com.intellij.codeInsight.lookup.LookupElement
+import com.intellij.codeInsight.lookup.WeighingContext
 
-public fun CompletionResultSet.addJetSorting(parameters : CompletionParameters) : CompletionResultSet {
+public fun CompletionResultSet.addJetSorting(parameters: CompletionParameters): CompletionResultSet {
     var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!!
 
     sorter = sorter.weighBefore("stats", JetKindWeigher())
@@ -33,14 +34,14 @@ public fun CompletionResultSet.addJetSorting(parameters : CompletionParameters)
             JetDeclarationRemotenessWeigher(parameters.getOriginalFile() as JetFile),
             JetAccessibleWeigher())
 
-    sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher(parameters))
+    sorter = sorter.weighBefore("middleMatching", PreferMatchingItemWeigher())
 
     return withRelevanceSorter(sorter)
 }
 
-class PreferMatchingItemWeigher(private val parameters: CompletionParameters) : LookupElementWeigher("preferMatching", false, true){
-    override fun weigh(element: LookupElement): Comparable<Int>? {
-        val prefix = parameters.getLookup().itemPattern(element)
+class PreferMatchingItemWeigher : LookupElementWeigher("preferMatching", false, true) {
+    override fun weigh(element: LookupElement, context: WeighingContext): Comparable<Int> {
+        val prefix = context.itemPattern(element)
         return if (element.getLookupString() == prefix) 0 else 1
     }
-}
+}

idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt

@@ -54,7 +54,7 @@ public class ErrorDuringFileAnalyzeNotificationProvider(val project: Project) :
 
     override fun getKey() = ERROR_HIGHLIGHT_PANEL_KEY
 
-    override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor?): EditorNotificationPanel? {
+    override fun createNotificationPanel(file: VirtualFile, fileEditor: FileEditor): EditorNotificationPanel? {
         if (file.getFileType() != JetFileType.INSTANCE) {
             return null
         }

update_dependencies.xml

@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="4355686"/>
-    <property name="public.buildserver.build.id" value="141986"/>
+    <property name="jb.buildserver.build.id" value="4410735"/>
+    <property name="public.buildserver.build.id" value="144918"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />
@@ -159,8 +159,8 @@
         <get-maven-library prefix="org/fusesource/jansi" lib="jansi" version="1.9"/>
         -->
 
-        <!-- Guava 14 sources-->
-        <get-maven-library prefix="com/google/guava" lib="guava" version="14.0.1" bin="false"/>
+        <!-- Guava 17 sources-->
+        <get-maven-library prefix="com/google/guava" lib="guava" version="17.0" bin="false"/>
 
         <!-- ASM -->
         <get src="https://raw.github.com/JetBrains/intellij-community/master/lib/src/asm5-src.zip"
@@ -201,7 +201,7 @@
         </unzip>
 
         <!-- Bootstrap compiler -->
-        <get src="http://teamcity.jetbrains.com/guestAuth/repository/download/bt345/bootstrap.tcbuildtag/kotlin-plugin-{build.number}.zip"
+        <get src="http://teamcity.jetbrains.com/guestAuth/repository/download/bt345/M8.tcbuildtag/kotlin-plugin-{build.number}.zip"
              dest="dependencies/download/bootstrap-compiler.zip" usetimestamp="true"/>
         <delete dir="dependencies/bootstrap-compiler" failonerror="false"/>
         <unzip src="dependencies/download/bootstrap-compiler.zip" dest="dependencies/bootstrap-compiler"/>
@@ -260,7 +260,7 @@
                     <mkdir dir="${jps-test}"/>
                     <get src="@{base.url.for.core}/core/intellij-core.jar" dest="${core}/intellij-core.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
-                    <get src="@{base.url}/core/guava-14.0.1.jar" dest="${core}/guava-14.0.1.jar" usetimestamp="true"/>
+                    <get src="@{base.url}/core/guava-17.0.jar" dest="${core}/guava-17.0.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>
                     <!--<get src="@{base.url}/core/snappy-java-1.0.5.jar" dest="${core}/snappy-java-1.0.5.jar" usetimestamp="true"/>-->
@@ -308,7 +308,7 @@
                     <matches pattern=".+\.mac\.zip" string="@{build.zip}"/>
                     <then>
                         <unzip src="dependencies/download/@{build.zip}" dest="ideaSDK">
-                            <cutdirsmapper dirs="1"/>
+                            <cutdirsmapper dirs="2"/>
                         </unzip>
                         <!-- Java can't manipulate permissions -->
                         <exec executable="chmod">