diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java index 8421aa6e2849..7e8ecfbec398 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java @@ -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); diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java index 07f13a3c6ea7..27725bcf29e5 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java @@ -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); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java index 05af2c44951d..b8e1ab509b10 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java @@ -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()