MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-105927 remove ancient RCS and SCCS from ignored files

Browse Source 
IDEA-155471 IDEA CE does not compile files under directory named "rcs" even remove "rcs" from "Ignored files and types" settings
This commit is contained in:
Sergey Ignatov
2016-10-30 23:41:14 +03:00
parent bb0a246d68
commit d2efbba31f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
community-resources/src/CommunityFileTypes.xml
+1 -1
View File
@@ -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"
java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
+2 -2
View File
@@ -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()) {
jps/model-impl/src/org/jetbrains/jps/model/impl/JpsFileTypesConfigurationImpl.java
+2 -2
View File
@@ -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) {
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form
+1 -1
View File
@@ -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>
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+1 -1
View File
@@ -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++) {