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

CPP-180 Global search finds matches in .svn directory

Browse Source 
+ restore defaults when CLion has already been used or custom exclusions added
This commit is contained in:
Anton Makeev
2014-12-02 16:54:22 +01:00
parent d3de085068
commit ce99c89cd9
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
+13 -2
View File
@@ -75,7 +75,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOMExternalizable, ExportableApplicationComponent, Disposable {
private static final Logger LOG = Logger.getInstance(FileTypeManagerImpl.class);
private static final int VERSION = 11;
private static final int VERSION = 12;
private static final Key<FileType> FILE_TYPE_KEY = Key.create("FILE_TYPE_KEY");
// cached auto-detected file type. If the file was auto-detected as plain text or binary
// then the value is null and autoDetectedAsText, autoDetectedAsBinary and autoDetectWasRun sets are used instead.
@@ -838,6 +838,9 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
@Override
public void readExternal(Element parentNode) throws InvalidDataException {
int savedVersion = getVersion(parentNode);
String previousIgnores = getIgnoredFilesList();
for (final Object o : parentNode.getChildren()) {
final Element e = (Element)o;
if (ELEMENT_FILETYPES.equals(e.getName())) {
@@ -890,9 +893,17 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements NamedJDOME
addIgnore(".bundle");
}
if (savedVersion < VERSION) {
if (savedVersion < 11) {
addIgnore("*.rbc");
}
if (savedVersion == 11 && PlatformUtils.isCLion()) {
// TODO During EAP CLion missed FileTypesManager.xml and users got empty excludes list
// TODO this code is only necessary until CLion 1.0 is released, then can be safely deleted
// previousIgnores come now from FileTypesManager.xml and merged with anything user may have added manually
myIgnoredPatterns.setIgnoreMasks(StringUtil.join(Arrays.asList(previousIgnores, getIgnoredFilesList()), ";"));
}
myIgnoredFileCache.clearCache();
fileTypeChangedCount.set(JDOMExternalizer.readInteger(parentNode, "fileTypeChangedCounter", 0));
autoDetectedAttribute = autoDetectedAttribute.newVersion(fileTypeChangedCount.get());