diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index abee33c0135..14330649bbe 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,30 +6,30 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="123.4" until-build="124.9999" />
+  <idea-version since-build="123.4" until-build="124.9999"/>
 
   <depends optional="true">JUnit</depends>
   <depends optional="true" config-file="kotlin-copyright.xml">com.intellij.copyright</depends>
 
   <project-components>
-      <component>
-          <implementation-class>org.jetbrains.jet.plugin.BuiltInsInitializer</implementation-class>
-      </component>
-      <component>
-          <implementation-class>org.jetbrains.jet.plugin.compiler.JetCompilerManager</implementation-class>
-      </component>
-      <component>
-          <implementation-class>org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver</implementation-class>
-      </component>
-      <component>
-          <implementation-class>org.jetbrains.jet.plugin.highlighter.DeclarationHintSupport</implementation-class>
-      </component>
-      <component>
-        <implementation-class>org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification</implementation-class>
-      </component>
-      <component>
-        <implementation-class>org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerUpdater</implementation-class>
-      </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.BuiltInsInitializer</implementation-class>
+    </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.compiler.JetCompilerManager</implementation-class>
+    </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver</implementation-class>
+    </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.highlighter.DeclarationHintSupport</implementation-class>
+    </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification</implementation-class>
+    </component>
+    <component>
+      <implementation-class>org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerUpdater</implementation-class>
+    </component>
   </project-components>
 
   <module-components>
@@ -39,227 +39,238 @@
   </module-components>
 
   <actions>
-     <action id="Kotlin.NewFile" class="org.jetbrains.jet.plugin.actions.NewKotlinFileAction">
-        <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
-     </action>
+    <action id="Kotlin.NewFile" class="org.jetbrains.jet.plugin.actions.NewKotlinFileAction">
+      <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
+    </action>
 
-     <action id="ShowJetExpressionType" class="org.jetbrains.jet.plugin.actions.ShowExpressionTypeAction"
-             text="Show Expression Type">
-         <keyboard-shortcut keymap="$default" first-keystroke="control shift Q"/>
-         <add-to-group group-id="CodeMenu" anchor="last"/>
-     </action>
-     <action id="CopyAsDiagnosticTest" class="org.jetbrains.jet.plugin.actions.CopyAsDiagnosticTestAction"
-             text="Copy Current File As Diagnostic Test">
-         <keyboard-shortcut keymap="$default" first-keystroke="control alt shift T"/>
-         <add-to-group group-id="CodeMenu" anchor="last"/>
-     </action>
-     <action id="ConvertJavaToKotlin" class="org.jetbrains.jet.plugin.actions.JavaToKotlinAction"
-             text="Convert Java File to Kotlin File">
-         <keyboard-shortcut keymap="$default" first-keystroke="control alt shift J"/>
-         <add-to-group group-id="CodeMenu" anchor="last"/>
-     </action>
-     <action id="ToggleJetErrorReporting" class="org.jetbrains.jet.plugin.actions.ToggleErrorReportingAction"
-             text="Error Reporting Enabled">
-         <keyboard-shortcut keymap="$default" first-keystroke="control alt shift E"/>
-         <add-to-group group-id="CodeMenu" anchor="last"/>
-     </action>
+    <action id="ShowJetExpressionType" class="org.jetbrains.jet.plugin.actions.ShowExpressionTypeAction"
+            text="Show Expression Type">
+      <keyboard-shortcut keymap="$default" first-keystroke="control shift Q"/>
+      <add-to-group group-id="CodeMenu" anchor="last"/>
+    </action>
+    <action id="CopyAsDiagnosticTest" class="org.jetbrains.jet.plugin.actions.CopyAsDiagnosticTestAction"
+            text="Copy Current File As Diagnostic Test">
+      <keyboard-shortcut keymap="$default" first-keystroke="control alt shift T"/>
+      <add-to-group group-id="CodeMenu" anchor="last"/>
+    </action>
+    <action id="ConvertJavaToKotlin" class="org.jetbrains.jet.plugin.actions.JavaToKotlinAction"
+            text="Convert Java File to Kotlin File">
+      <keyboard-shortcut keymap="$default" first-keystroke="control alt shift J"/>
+      <add-to-group group-id="CodeMenu" anchor="last"/>
+    </action>
+    <action id="ToggleJetErrorReporting" class="org.jetbrains.jet.plugin.actions.ToggleErrorReportingAction"
+            text="Error Reporting Enabled">
+      <keyboard-shortcut keymap="$default" first-keystroke="control alt shift E"/>
+      <add-to-group group-id="CodeMenu" anchor="last"/>
+    </action>
 
-     <group id="EditorGutterKotlinPopupMenu">
-       <action id="ShowKotlinSignatures" class="org.jetbrains.jet.plugin.codeInsight.ktSignature.ShowKotlinSignaturesAction"/>
-       <add-to-group group-id="EditorGutterPopupMenu" anchor="last" />
-     </group>
+    <group id="EditorGutterKotlinPopupMenu">
+      <action id="ShowKotlinSignatures" class="org.jetbrains.jet.plugin.codeInsight.ktSignature.ShowKotlinSignaturesAction"/>
+      <add-to-group group-id="EditorGutterPopupMenu" anchor="last"/>
+    </group>
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
-      <applicationService serviceInterface="org.jetbrains.jet.lang.psi.stubs.elements.StubIndexService"
-                          serviceImplementation="org.jetbrains.jet.plugin.stubindex.StubIndexServiceImpl" />
+    <applicationService serviceInterface="org.jetbrains.jet.lang.psi.stubs.elements.StubIndexService"
+                        serviceImplementation="org.jetbrains.jet.plugin.stubindex.StubIndexServiceImpl"/>
 
-      <applicationService serviceInterface="org.jetbrains.jet.OperationModeProvider"
-                          serviceImplementation="org.jetbrains.jet.plugin.IdeModeProvider" />
+    <applicationService serviceInterface="org.jetbrains.jet.OperationModeProvider"
+                        serviceImplementation="org.jetbrains.jet.plugin.IdeModeProvider"/>
 
-      <projectService serviceInterface="org.jetbrains.jet.lang.resolve.java.JetFilesProvider"
-                      serviceImplementation="org.jetbrains.jet.plugin.project.PluginJetFilesProvider"/>
+    <projectService serviceInterface="org.jetbrains.jet.lang.resolve.java.JetFilesProvider"
+                    serviceImplementation="org.jetbrains.jet.plugin.project.PluginJetFilesProvider"/>
 
-      <projectService serviceInterface="org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager"
-                      serviceImplementation="org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager"/>
+    <projectService serviceInterface="org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager"
+                    serviceImplementation="org.jetbrains.jet.plugin.caches.resolve.KotlinCacheManager"/>
 
-      <projectService serviceInterface="org.jetbrains.jet.asJava.LightClassGenerationSupport"
-                      serviceImplementation="org.jetbrains.jet.plugin.caches.resolve.IDELightClassGenerationSupport"/>
+    <projectService serviceInterface="org.jetbrains.jet.asJava.LightClassGenerationSupport"
+                    serviceImplementation="org.jetbrains.jet.plugin.caches.resolve.IDELightClassGenerationSupport"/>
 
-      <projectService serviceInterface="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"
-                      serviceImplementation="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"/>
+    <projectService serviceInterface="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"
+                    serviceImplementation="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"/>
 
-      <errorHandler implementation="org.jetbrains.jet.plugin.reporter.KotlinReportSubmitter"/>
+    <errorHandler implementation="org.jetbrains.jet.plugin.reporter.KotlinReportSubmitter"/>
 
-      <internalFileTemplate name="Kotlin File"/>
-      <internalFileTemplate name="Kotlin Class"/>
-      <internalFileTemplate name="Kotlin Enum"/>
-      <internalFileTemplate name="Kotlin Trait"/>
+    <internalFileTemplate name="Kotlin File"/>
+    <internalFileTemplate name="Kotlin Class"/>
+    <internalFileTemplate name="Kotlin Enum"/>
+    <internalFileTemplate name="Kotlin Trait"/>
 
-      <gotoSymbolContributor implementation="org.jetbrains.jet.plugin.caches.JetGotoSymbolContributor"/>
-      <gotoClassContributor implementation="org.jetbrains.jet.plugin.caches.JetGotoClassContributor"/>
-      <lang.importOptimizer language="jet" implementationClass="org.jetbrains.jet.plugin.editor.importOptimizer.JetImportOptimizer"/>
+    <gotoSymbolContributor implementation="org.jetbrains.jet.plugin.caches.JetGotoSymbolContributor"/>
+    <gotoClassContributor implementation="org.jetbrains.jet.plugin.caches.JetGotoClassContributor"/>
+    <lang.importOptimizer language="jet" implementationClass="org.jetbrains.jet.plugin.editor.importOptimizer.JetImportOptimizer"/>
 
-      <fileTypeFactory implementation="org.jetbrains.jet.plugin.JetFileFactory"/>
+    <fileTypeFactory implementation="org.jetbrains.jet.plugin.JetFileFactory"/>
 
-      <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar"/>
+    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar"/>
 
-      <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetSyntaxHighlighterFactory"/>
-      <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
-      <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
-      <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
-      <lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.jet.plugin.structureView.JetStructureViewFactory"/>
-      <lang.foldingBuilder language="jet" implementationClass="org.jetbrains.jet.plugin.JetFoldingBuilder"/>
-      <lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
-      <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
-      <importFilteringRule implementation="org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule"/>
-      <lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
-      <lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinExpressionSurroundDescriptor"/>
-      <lang.surroundDescriptor language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.statement.KotlinStatementSurroundDescriptor"/>
-      <quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
-      <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler"/>
-      <refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
-      <treeStructureProvider implementation="org.jetbrains.jet.plugin.projectView.JetProjectViewProvider"/>
+    <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetSyntaxHighlighterFactory"/>
+    <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
+    <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
+    <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
+    <lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.jet.plugin.structureView.JetStructureViewFactory"/>
+    <lang.foldingBuilder language="jet" implementationClass="org.jetbrains.jet.plugin.JetFoldingBuilder"/>
+    <lang.formatter language="jet" implementationClass="org.jetbrains.jet.plugin.formatter.JetFormattingModelBuilder"/>
+    <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
+    <importFilteringRule implementation="org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule"/>
+    <lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
+    <lang.surroundDescriptor language="jet"
+                             implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinExpressionSurroundDescriptor"/>
+    <lang.surroundDescriptor language="jet"
+                             implementationClass="org.jetbrains.jet.plugin.codeInsight.surroundWith.statement.KotlinStatementSurroundDescriptor"/>
+    <quoteHandler fileType="Kotlin" className="org.jetbrains.jet.plugin.editor.KotlinQuoteHandler"/>
+    <refactoring.moveHandler implementation="org.jetbrains.jet.plugin.refactoring.move.JetMoveFilesOrDirectoriesHandler"/>
+    <refactoring.copyHandler implementation="org.jetbrains.jet.plugin.refactoring.copy.JetCopyClassHandler"/>
+    <treeStructureProvider implementation="org.jetbrains.jet.plugin.projectView.JetProjectViewProvider"/>
 
-      <colorSettingsPage implementation="org.jetbrains.jet.plugin.highlighter.JetColorSettingsPage" />
-      <additionalTextAttributes scheme="Darcula" file="/colorScheme/Darcula_Kotlin.xml" />
+    <colorSettingsPage implementation="org.jetbrains.jet.plugin.highlighter.JetColorSettingsPage"/>
+    <additionalTextAttributes scheme="Darcula" file="/colorScheme/Darcula_Kotlin.xml"/>
 
-      <codeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetCodeStyleSettingsProvider"/>
-      <langCodeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetLanguageCodeStyleSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetCodeStyleSettingsProvider"/>
+    <langCodeStyleSettingsProvider implementation="org.jetbrains.jet.plugin.formatter.JetLanguageCodeStyleSettingsProvider"/>
 
-      <templateParameterTraversalPolicy implementation="org.jetbrains.jet.plugin.completion.JetTemplateParameterTraversalPolicy"/>
+    <templateParameterTraversalPolicy implementation="org.jetbrains.jet.plugin.completion.JetTemplateParameterTraversalPolicy"/>
 
-      <codeInsight.parameterInfo language="jet" implementationClass="org.jetbrains.jet.plugin.parameterInfo.JetFunctionParameterInfoHandler"/>
+    <codeInsight.parameterInfo language="jet" implementationClass="org.jetbrains.jet.plugin.parameterInfo.JetFunctionParameterInfoHandler"/>
 
-      <codeInsight.gotoSuper language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.GotoSuperActionHandler" />
-      <typeDeclarationProvider implementation="org.jetbrains.jet.plugin.codeInsight.JetTypeDeclarationProvider" />
+    <codeInsight.gotoSuper language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.GotoSuperActionHandler"/>
+    <typeDeclarationProvider implementation="org.jetbrains.jet.plugin.codeInsight.JetTypeDeclarationProvider"/>
 
-      <completion.contributor language="jet" id="JetKeywordCompletionContributor" order="first"
-                              implementationClass="org.jetbrains.jet.plugin.completion.JetKeywordCompletionContributor"/>
+    <completion.contributor language="jet" id="JetKeywordCompletionContributor" order="first"
+                            implementationClass="org.jetbrains.jet.plugin.completion.JetKeywordCompletionContributor"/>
 
-      <completion.contributor language="jet" id="JetPackagesContributor" order="after JetKeywordCompletionContributor"
-                              implementationClass="org.jetbrains.jet.plugin.completion.JetPackagesContributor" />
+    <completion.contributor language="jet" id="JetPackagesContributor" order="after JetKeywordCompletionContributor"
+                            implementationClass="org.jetbrains.jet.plugin.completion.JetPackagesContributor"/>
 
-      <completion.contributor language="jet" id="JetExtensionFunctionReceiverContributor" order="after JetPackagesContributor"
-                            implementationClass="org.jetbrains.jet.plugin.completion.JetExtensionReceiverTypeContributor" />
+    <completion.contributor language="jet" id="JetExtensionFunctionReceiverContributor" order="after JetPackagesContributor"
+                            implementationClass="org.jetbrains.jet.plugin.completion.JetExtensionReceiverTypeContributor"/>
 
-      <completion.contributor language="jet" id="JetCompletionContributor" order="after JetExtensionFunctionReceiverContributor"
-                              implementationClass="org.jetbrains.jet.plugin.completion.JetCompletionContributor"/>
+    <completion.contributor language="jet" id="JetCompletionContributor" order="after JetExtensionFunctionReceiverContributor"
+                            implementationClass="org.jetbrains.jet.plugin.completion.JetCompletionContributor"/>
 
-      <completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor" id="liveTemplates" order="first"/>
+    <completion.contributor language="jet" implementationClass="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor"
+                            id="liveTemplates" order="first"/>
 
-      <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
-      <completion.confidence language="jet" implementationClass="org.jetbrains.jet.plugin.completion.confidence.UnfocusedPossibleFunctionParameter"/>
-      <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
+    <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
+    <completion.confidence language="jet"
+                           implementationClass="org.jetbrains.jet.plugin.completion.confidence.UnfocusedPossibleFunctionParameter"/>
+    <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
 
-      <completion.skip implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
+    <completion.skip implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor$Skipper"
+                     id="skipLiveTemplate"/>
 
-      <lookup.charFilter implementation="org.jetbrains.jet.plugin.completion.JetReferenceCharFilter"/>
+    <lookup.charFilter implementation="org.jetbrains.jet.plugin.completion.JetReferenceCharFilter"/>
 
-      <psi.referenceContributor language="jet" order="after JetCompletionContributor" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
+    <psi.referenceContributor language="jet" order="after JetCompletionContributor"
+                              implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
 
-      <renamePsiElementProcessor implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameJetClassProcessor"/>
-      <renamePsiElementProcessor implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameKotlinFunctionProcessor"/>
+    <renamePsiElementProcessor implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameJetClassProcessor"/>
+    <renamePsiElementProcessor implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameKotlinFunctionProcessor"/>
 
-      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Generic"/>
-      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Namespace"/>
-      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Statement"/>
-      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Class"/>
-      <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/>
-      <defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/>
-      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnyVariableMacro"/>
-      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetFunctionParametersMacro"/>
-      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnonymousSuperMacro"/>
-      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetIterableVariableMacro"/>
-      <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetSuggestVariableNameMacro"/>
+    <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Generic"/>
+    <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Namespace"/>
+    <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Statement"/>
+    <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Class"/>
+    <liveTemplateContext implementation="org.jetbrains.jet.plugin.liveTemplates.JetTemplateContextType$Expression"/>
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplatesProvider"/>
+    <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnyVariableMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetFunctionParametersMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetAnonymousSuperMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetIterableVariableMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.jet.plugin.liveTemplates.macro.JetSuggestVariableNameMacro"/>
 
-      <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetPsiChecker"/>
-      <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.DebugInfoAnnotator"/>
+    <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetPsiChecker"/>
+    <annotator language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.DebugInfoAnnotator"/>
 
-      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetStatementGroupSelectioner"/>
-      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetCodeBlockSelectioner"/>
-      <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetListSelectioner"/>
-      <typedHandler implementation="org.jetbrains.jet.plugin.editor.KotlinTypedHandler" />
-      <backspaceHandlerDelegate implementation="org.jetbrains.jet.plugin.editor.KotlinBackspaceHandler" />
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetStatementGroupSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetCodeBlockSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.jet.plugin.editor.wordSelection.JetListSelectioner"/>
+    <typedHandler implementation="org.jetbrains.jet.plugin.editor.KotlinTypedHandler"/>
+    <backspaceHandlerDelegate implementation="org.jetbrains.jet.plugin.editor.KotlinBackspaceHandler"/>
 
-      <copyPastePostProcessor implementation="org.jetbrains.jet.plugin.conversion.copy.JavaCopyPastePostProcessor"/>
-      <lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.JetQuickDocumentationProvider" order="first"/>
-      <documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
-      <configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
-      <configurationType implementation="org.jetbrains.jet.plugin.k2jsrun.K2JSRunConfigurationType"/>
-      <programRunner implementation="org.jetbrains.jet.plugin.k2jsrun.K2JSBrowserProgramRunner"/>
-      <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationProducer"/>
-      <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetJUnitConfigurationProducer"/>
-      <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetLineMarkerProvider"/>
-      <codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerProvider"/>
-      <iconProvider implementation="org.jetbrains.jet.plugin.JetIconProvider"/>
-      <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetFunctionPresenter" forClass="org.jetbrains.jet.lang.psi.JetNamedFunction"/>
-      <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetClassPresenter" forClass="org.jetbrains.jet.lang.psi.JetClass"/>
-      <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetPropertyPresenter" forClass="org.jetbrains.jet.lang.psi.JetProperty"/>
-      <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.jet.plugin.JetGotoTargetRenderProvider" order="first"/>
-      <elementDescriptionProvider implementation="org.jetbrains.jet.plugin.findUsages.JetElementDescriptionProvider"/>
-      <findUsagesHandlerFactory implementation="org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory"/>
-      <debugger.positionManagerFactory implementation="org.jetbrains.jet.plugin.debugger.JetPositionManagerFactory"/>
-      <codeInsight.implementMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler"/>
-      <codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.OverrideMethodsHandler"/>
+    <copyPastePostProcessor implementation="org.jetbrains.jet.plugin.conversion.copy.JavaCopyPastePostProcessor"/>
+    <lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.jet.plugin.JetQuickDocumentationProvider" order="first"/>
+    <documentationProvider implementation="org.jetbrains.jet.plugin.JetQuickDocumentationProvider"/>
+    <configurationType implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationType"/>
+    <configurationType implementation="org.jetbrains.jet.plugin.k2jsrun.K2JSRunConfigurationType"/>
+    <programRunner implementation="org.jetbrains.jet.plugin.k2jsrun.K2JSBrowserProgramRunner"/>
+    <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetRunConfigurationProducer"/>
+    <configurationProducer implementation="org.jetbrains.jet.plugin.run.JetJUnitConfigurationProducer"/>
+    <codeInsight.lineMarkerProvider language="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetLineMarkerProvider"/>
+    <codeInsight.lineMarkerProvider language="JAVA"
+                                    implementationClass="org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureInJavaMarkerProvider"/>
+    <iconProvider implementation="org.jetbrains.jet.plugin.JetIconProvider"/>
+    <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetFunctionPresenter"
+                              forClass="org.jetbrains.jet.lang.psi.JetNamedFunction"/>
+    <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetClassPresenter"
+                              forClass="org.jetbrains.jet.lang.psi.JetClass"/>
+    <itemPresentationProvider implementationClass="org.jetbrains.jet.plugin.presentation.JetPropertyPresenter"
+                              forClass="org.jetbrains.jet.lang.psi.JetProperty"/>
+    <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.jet.plugin.JetGotoTargetRenderProvider"
+                                order="first"/>
+    <elementDescriptionProvider implementation="org.jetbrains.jet.plugin.findUsages.JetElementDescriptionProvider"/>
+    <findUsagesHandlerFactory implementation="org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory"/>
+    <debugger.positionManagerFactory implementation="org.jetbrains.jet.plugin.debugger.JetPositionManagerFactory"/>
+    <codeInsight.implementMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler"/>
+    <codeInsight.overrideMethod language="jet" implementationClass="org.jetbrains.jet.plugin.codeInsight.OverrideMethodsHandler"/>
 
-      <java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
-      <java.shortNamesCache implementation="org.jetbrains.jet.plugin.caches.JetShortNamesCache"/>
+    <java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
+    <java.shortNamesCache implementation="org.jetbrains.jet.plugin.caches.JetShortNamesCache"/>
 
-      <stubElementTypeHolder class="org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAllPackagesIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetClassByPackageIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortClassNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortFunctionNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortPropertiesNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetExtensionFunctionNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAllShortFunctionNameIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetSuperClassIndex"/>
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex" />
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex" />
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex" />
-      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelShortObjectNameIndex" />
+    <stubElementTypeHolder class="org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAllPackagesIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetClassByPackageIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortClassNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortFunctionNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetShortPropertiesNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetExtensionFunctionNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAllShortFunctionNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetSuperClassIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex"/>
+    <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelShortObjectNameIndex"/>
 
-      <fileBasedIndex implementation="org.jetbrains.jet.plugin.versions.KotlinAbiVersionIndex"/>
+    <fileBasedIndex implementation="org.jetbrains.jet.plugin.versions.KotlinAbiVersionIndex"/>
 
-      <contentBasedClassFileProcessor implementation="org.jetbrains.jet.plugin.libraries.JetContentBasedFileSubstitutor" />
-      <psi.clsCustomNavigationPolicy implementation="org.jetbrains.jet.plugin.libraries.JetClsNavigationPolicy" />
-      <psi.clsDecompiledFileProvider implementation="org.jetbrains.jet.plugin.libraries.JetClsFileDecompiledPsiFileProvider" />
+    <contentBasedClassFileProcessor implementation="org.jetbrains.jet.plugin.libraries.JetContentBasedFileSubstitutor"/>
+    <psi.clsCustomNavigationPolicy implementation="org.jetbrains.jet.plugin.libraries.JetClsNavigationPolicy"/>
+    <psi.clsDecompiledFileProvider implementation="org.jetbrains.jet.plugin.libraries.JetClsFileDecompiledPsiFileProvider"/>
 
-      <editorNotificationProvider implementation="org.jetbrains.jet.plugin.versions.KotlinLibrariesNotificationProvider"/>
-      <editorNotificationProvider implementation="org.jetbrains.jet.plugin.quickfix.AbsentJdkAnnotationsNotifications"/>
+    <editorNotificationProvider implementation="org.jetbrains.jet.plugin.versions.KotlinLibrariesNotificationProvider"/>
+    <editorNotificationProvider implementation="org.jetbrains.jet.plugin.quickfix.AbsentJdkAnnotationsNotifications"/>
 
-      <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
+    <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
 
-      <referencesSearch implementation="org.jetbrains.jet.plugin.search.KotlinReferencesSearcher"/>
-      <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDirectInheritorsSearcher"/>
-      <definitionsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher"/>
-      <annotatedElementsSearch implementation="org.jetbrains.jet.plugin.search.KotlinAnnotatedElementsSearcher"/>
+    <referencesSearch implementation="org.jetbrains.jet.plugin.search.KotlinReferencesSearcher"/>
+    <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDirectInheritorsSearcher"/>
+    <definitionsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher"/>
+    <annotatedElementsSearch implementation="org.jetbrains.jet.plugin.search.KotlinAnnotatedElementsSearcher"/>
 
-      <exceptionFilter implementation="org.jetbrains.jet.plugin.filters.JetExceptionFilterFactory" order="first"/>
+    <exceptionFilter implementation="org.jetbrains.jet.plugin.filters.JetExceptionFilterFactory" order="first"/>
 
-      <toolWindow id="Kotlin"
-                  factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
-                  anchor="right"
-                  icon="/org/jetbrains/jet/plugin/icons/kotlin_13.png"
-              />
+    <toolWindow id="Kotlin"
+                factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
+                anchor="right"
+                icon="/org/jetbrains/jet/plugin/icons/kotlin_13.png"
+        />
 
-      <applicationService serviceInterface="org.jetbrains.jet.plugin.editor.JetEditorOptions"
-                          serviceImplementation="org.jetbrains.jet.plugin.editor.JetEditorOptions"/>
-      <editorAppearanceConfigurable instance="org.jetbrains.jet.plugin.editor.JetSettingEditorConfigurable"/>
+    <applicationService serviceInterface="org.jetbrains.jet.plugin.editor.JetEditorOptions"
+                        serviceImplementation="org.jetbrains.jet.plugin.editor.JetEditorOptions"/>
+    <editorAppearanceConfigurable instance="org.jetbrains.jet.plugin.editor.JetSettingEditorConfigurable"/>
 
-      <intentionAction>
-        <className>org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction</className>
-        <category>Kotlin</category>
-      </intentionAction>
+    <intentionAction>
+      <className>org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction</className>
+      <category>Kotlin</category>
+    </intentionAction>
 
-      <intentionAction>
-        <className>org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureAnnotationIntention</className>
-        <category>Kotlin</category>
-      </intentionAction>
+    <intentionAction>
+      <className>org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureAnnotationIntention</className>
+      <category>Kotlin</category>
+    </intentionAction>
 
-      <project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>
+    <project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>
 
   </extensions>