Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Apr 2015 10:35:20 +0000 (12:35 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 21 Apr 2015 10:35:20 +0000 (12:35 +0200)
1  2 
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java

index ce4e368eca30eb31f8f57a33c6a62abfffdbf3cb,2eee1b40361fd5128b93d6a4d45a8c93660b48af..98b47de2a4d7bde5068ead7e719a65c9fe397ceb
@@@ -88,10 -88,10 +88,10 @@@ public class FileTypeManagerImpl extend
  
    @NonNls
    private static final String DEFAULT_IGNORED =
 -    "*.hprof;*.pyc;*.pyo;*.rbc;*~;.DS_Store;.bundle;.git;.hg;.svn;CVS;RCS;SCCS;__pycache__;_svn;rcs;vssver.scc;vssver2.scc;";
 +    "*.hprof;*.pyc;*.pyo;*.rbc;*~;.DS_Store;.bundle;.git;.hg;.svn;CVS;RCS;SCCS;__pycache__;.tox;_svn;rcs;vssver.scc;vssver2.scc;";
  
    private static boolean RE_DETECT_ASYNC = !ApplicationManager.getApplication().isUnitTestMode();
-   private final Set<FileType> myDefaultTypes = new THashSet<FileType>();
+   private final Collection<FileType> myDefaultTypes = new THashSet<FileType>();
    private final List<FileTypeIdentifiableByVirtualFile> mySpecialFileTypes = new ArrayList<FileTypeIdentifiableByVirtualFile>();
  
    private FileTypeAssocTable<FileType> myPatternsTable = new FileTypeAssocTable<FileType>();