From d2efbba31f9ef20ad2529dd89596d2ca33939d38 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Sun, 30 Oct 2016 23:20:19 +0300
Subject: [PATCH] IDEA-105927 remove ancient RCS and SCCS from ignored files

IDEA-155471 IDEA CE does not compile files under directory named "rcs" even remove "rcs" from "Ignored files and types" settings
---
 community-resources/src/CommunityFileTypes.xml                | 2 +-
 .../com/intellij/openapi/roots/impl/DirectoryIndexTest.java   | 4 ++--
 .../jps/model/impl/JpsFileTypesConfigurationImpl.java         | 4 ++--
 .../com/intellij/openapi/fileTypes/impl/FileTypePanel.form    | 2 +-
 .../intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/community-resources/src/CommunityFileTypes.xml b/community-resources/src/CommunityFileTypes.xml
index 18f74cdd5101..ea9e8ff5ede0 100644
--- a/community-resources/src/CommunityFileTypes.xml
+++ b/community-resources/src/CommunityFileTypes.xml
@@ -1,6 +1,6 @@
 <component version="2">
 
-  <ignoreFiles list="CVS;SCCS;RCS;rcs;.DS_Store;.svn;.pyc;.pyo"/>
+  <ignoreFiles list="CVS;.DS_Store;.svn;.pyc;.pyo"/>
 
   <filetypes>
     <filetype name = "IDL" description = "IDL files"
diff --git a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
index a631a0eda761..f0d62a00681f 100644
--- a/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
+++ b/java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
@@ -355,7 +355,7 @@ public class DirectoryIndexTest extends IdeaTestCase {
   }
 
   public void testModuleUnderIgnoredDir() {
-    final VirtualFile ignored = createChildDirectory(myRootVFile, "RCS");
+    final VirtualFile ignored = createChildDirectory(myRootVFile, ".git");
     assertTrue(FileTypeManager.getInstance().isFileIgnored(ignored));
     assertTrue(myFileIndex.isExcluded(ignored));
     assertTrue(myFileIndex.isUnderIgnored(ignored));
@@ -377,7 +377,7 @@ public class DirectoryIndexTest extends IdeaTestCase {
   }
 
   public void testModuleInIgnoredDir() {
-    final VirtualFile ignored = createChildDirectory(myRootVFile, "RCS");
+    final VirtualFile ignored = createChildDirectory(myRootVFile, ".git");
     assertTrue(FileTypeManager.getInstance().isFileIgnored(ignored));
     
     new WriteCommandAction.Simple(getProject()) {
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsFileTypesConfigurationImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsFileTypesConfigurationImpl.java
index b1e0c2e6491f..2b15b3183c7b 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsFileTypesConfigurationImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsFileTypesConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public class JpsFileTypesConfigurationImpl extends JpsElementBase<JpsFileTypesCo
   private String myIgnoredPatternString;
 
   public JpsFileTypesConfigurationImpl() {
-    this("CVS;SCCS;RCS;rcs;.DS_Store;.svn;.pyc;.pyo;*.pyc;*.pyo;.git;*.hprof;_svn;.hg;*.lib;*~;__pycache__;.bundle;vssver.scc;vssver2.scc;*.rbc;");
+    this("CVS;.DS_Store;.svn;.pyc;.pyo;*.pyc;*.pyo;.git;*.hprof;_svn;.hg;*.lib;*~;__pycache__;.bundle;vssver.scc;vssver2.scc;*.rbc;");
   }
 
   private JpsFileTypesConfigurationImpl(String ignoredPatternString) {
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form
index 399a39345a62..ac6264a71c42 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form
@@ -40,7 +40,7 @@
             <properties>
               <focusCycleRoot value="false"/>
               <opaque value="true"/>
-              <text value=".dependency-info;CVS;RCS;SCCS;rcs;"/>
+              <text value=".dependency-info;CVS;"/>
             </properties>
           </component>
         </children>
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
index 1fa768520e7e..15cf174e5225 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
@@ -98,7 +98,7 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent
   private static final int DETECT_BUFFER_SIZE = 8192; // the number of bytes to read from the file to feed to the file type detector
 
   // must be sorted
-  private static final String DEFAULT_IGNORED = "*.hprof;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;RCS;SCCS;__pycache__;_svn;rcs;vssver.scc;vssver2.scc;";
+  private static final String DEFAULT_IGNORED = "*.hprof;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc;";
   static {
     List<String> strings = StringUtil.split(DEFAULT_IGNORED, ";");
     for (int i = 0; i < strings.size(); i++) {