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

copyright: detect file types always by vFile (IDEA-63818)

Browse Source
This commit is contained in:
anna
2011-01-12 11:48:37 +01:00
parent e951af6408
commit 0ceb0cd90c
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java
+2 -1
View File
@@ -227,7 +227,8 @@ public class CopyrightManager extends AbstractProjectComponent implements JDOMEx
@Nullable
public CopyrightProfile getCopyrightOptions(@NotNull PsiFile file) {
if (myOptions.getOptions(file.getFileType().getName()).getFileTypeOverride() == LanguageOptions.NO_COPYRIGHT) return null;
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile == null || myOptions.getOptions(virtualFile.getFileType().getName()).getFileTypeOverride() == LanguageOptions.NO_COPYRIGHT) return null;
final DependencyValidationManager validationManager = DependencyValidationManager.getInstance(myProject);
for (String scopeName : myModule2Copyrights.keySet()) {
final NamedScope namedScope = validationManager.getScope(scopeName);
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java
+3 -1
View File
@@ -18,6 +18,7 @@ package com.maddyhome.idea.copyright.psi;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
@@ -32,7 +33,8 @@ public class UpdateCopyrightFactory
public static UpdateCopyright createUpdateCopyright(Project project, Module module, PsiFile file,
CopyrightProfile options)
{
return createUpdateCopyright(project, module, file.getVirtualFile(), file.getFileType(), options);
final VirtualFile virtualFile = file.getVirtualFile();
return createUpdateCopyright(project, module, virtualFile, virtualFile != null ? virtualFile.getFileType() : null, options);
}
plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
+1 -1
View File
@@ -241,7 +241,7 @@ public class FileTypeUtil
final VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile == null) return false;
if (ProjectUtil.isProjectOrWorkspaceFile(virtualFile)) return false;
return isSupportedType(file.getFileType());
return isSupportedType(virtualFile.getFileType());
}
public FileType[] getSupportedTypes()