Merge remote-tracking branch 'origin/master'

platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/DetectableIndentOptionsProvider.java

@@ -25,6 +25,7 @@ import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiCompiledFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.*;
 import com.intellij.testFramework.LightVirtualFile;
@@ -63,6 +64,7 @@ public class DetectableIndentOptionsProvider extends FileIndentOptionsProvider {
   }
 
   private boolean isEnabled(@NotNull CodeStyleSettings settings, @NotNull PsiFile file) {
+    if (file instanceof PsiCompiledFile) return false;
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       return myIsEnabledInTest;
     }

platform/platform-resources/src/checkedPlugins.txt

@@ -18,4 +18,5 @@ org.jetbrains.plugins.vagrant
 com.jetbrains.plugins.ini4idea
 com.jetbrains.plugins.meteor
 AWSCloudFormation
-Dart
+Dart
+IdeaVIM