#391 - Error when changing directory name

JetBrains · Jul 29, 2017 · e32c616 · e32c616
1 parent 809b491
commit e32c616
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Fixed "You are editing..." message display conditions [\#351](https://github.com/hsz/idea-gitignore/issues/351) [\#352](https://github.com/hsz/idea-gitignore/issues/352) [\#356](https://github.com/hsz/idea-gitignore/issues/356)
 - It's prohibited to access index during event dispatching [\#358](https://github.com/hsz/idea-gitignore/issues/358) [\#355](https://github.com/hsz/idea-gitignore/issues/355) [\#369](https://github.com/hsz/idea-gitignore/issues/369)
 - Already disposed: com.intellij.util.messages.impl.MessageBusImpl [\#360](https://github.com/hsz/idea-gitignore/issues/360)
+- NotNull error when changing directory name [\##391](https://github.com/hsz/idea-gitignore/issues/#391)
 
 ## [v1.7.6](https://github.com/hsz/idea-gitignore/tree/v1.7.6) (2017-02-23)
 

diff --git a/README.md b/README.md
@@ -131,6 +131,7 @@ Changelog
 - Fixed "You are editing..." message display conditions [\#351](https://github.com/hsz/idea-gitignore/issues/351) [\#352](https://github.com/hsz/idea-gitignore/issues/352) [\#356](https://github.com/hsz/idea-gitignore/issues/356)
 - It's prohibited to access index during event dispatching [\#358](https://github.com/hsz/idea-gitignore/issues/358) [\#355](https://github.com/hsz/idea-gitignore/issues/355) [\#369](https://github.com/hsz/idea-gitignore/issues/369)
 - Already disposed: com.intellij.util.messages.impl.MessageBusImpl [\#360](https://github.com/hsz/idea-gitignore/issues/360)
+- NotNull error when changing directory name [\##391](https://github.com/hsz/idea-gitignore/issues/#391)
 
 [Full Changelog History](./CHANGELOG.md)
 

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -97,6 +97,7 @@
             <li>Fixed "You are editing..." message display conditions (<a href="https://github.com/hsz/idea-gitignore/issues/351">351</a>, <a href="https://github.com/hsz/idea-gitignore/issues/352">352</a>, <a href="https://github.com/hsz/idea-gitignore/issues/356">356</a>)</li>
             <li>It's prohibited to access index during event dispatching (<a href="https://github.com/hsz/idea-gitignore/issues/358">358</a>, <a href="https://github.com/hsz/idea-gitignore/issues/355">355</a>, <a href="https://github.com/hsz/idea-gitignore/issues/369">369</a>)</li>
             <li>Already disposed: com.intellij.util.messages.impl.MessageBusImpl (<a href="https://github.com/hsz/idea-gitignore/issues/360">360</a>)</li>
+            <li>NotNull error when changing directory name (<a href="https://github.com/hsz/idea-gitignore/issues/391">391</a>)</li>
         </ul>
 
         <a href="https://github.com/hsz/idea-gitignore/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>

diff --git a/resources/messages/IgnoreBundle.properties b/resources/messages/IgnoreBundle.properties
@@ -168,6 +168,7 @@ Fixes:<br/>\
 - Fixed "You are editing..." message display conditions (#351, #352, #356)<br/>\
 - It's prohibited to access index during event dispatching (#358, #355, #369)<br/>\
 - Already disposed: com.intellij.util.messages.impl.MessageBusImpl (#360)<br/>\
+- NotNull error when changing directory name (#391)<br/>\
 <br/>\
 <span style="font-size: 120%">If you find my plugin helpful, donate me using <br/><b>\
 <a href="https://www.paypal.me/hsz">PayPal</a> or \

diff --git a/src/mobi/hsz/idea/gitignore/actions/IgnoreFileGroupAction.java b/src/mobi/hsz/idea/gitignore/actions/IgnoreFileGroupAction.java
@@ -69,6 +69,7 @@ public class IgnoreFileGroupAction extends ActionGroup {
     private final String presentationTextSingleKey;
 
     /** {@link Project}'s base directory. */
+    @Nullable
     private VirtualFile baseDir;
 
     /**
@@ -139,7 +140,7 @@ public AnAction[] getChildren(@Nullable AnActionEvent e) {
         AnAction[] actions;
         int count = countFiles();
 
-        if (count == 0) {
+        if (count == 0 || baseDir == null) {
             actions = new AnAction[0];
         } else {
             actions = new AnAction[count];

diff --git a/src/mobi/hsz/idea/gitignore/codeInspection/IgnoreUnusedEntryInspection.java b/src/mobi/hsz/idea/gitignore/codeInspection/IgnoreUnusedEntryInspection.java
@@ -113,6 +113,10 @@ private boolean isEntryExcluded(@NotNull IgnoreEntry entry, @NotNull Project pro
                 final List<VirtualFile> matched = ContainerUtil.newArrayList();
                 final Collection<VirtualFile> files = cache.getFilesForPattern(project, pattern);
 
+                if (projectRoot == null) {
+                    return false;
+                }
+
                 for (final VirtualFile root : Utils.getExcludedRoots(project)) {
                     for (VirtualFile file : files) {
                         if (!Utils.isUnder(file, root)) {

diff --git a/src/mobi/hsz/idea/gitignore/reference/IgnoreReferenceSet.java b/src/mobi/hsz/idea/gitignore/reference/IgnoreReferenceSet.java
@@ -264,7 +264,7 @@ public boolean visitFile(@NotNull VirtualFile file) {
                             continue;
                         }
 
-                        String name = (root != null) ? Utils.getRelativePath(root, file) : file.getName();
+                        final String name = (root != null) ? Utils.getRelativePath(root, file) : file.getName();
                         if (MatcherUtil.match(matcher, name)) {
                             PsiFileSystemItem psiFileSystemItem = getPsiFileSystemItem(manager, file);
                             if (psiFileSystemItem == null) {