#547 #523 #528 #486 - Removed "tracked & ignored" feature

CHANGELOG.md

@@ -10,6 +10,7 @@ Change Log
 - .gcloudignore (Google Cloud) support [\#577](https://github.com/hsz/idea-gitignore/issues/577)
 - .nuxtignore (Nuxt.js) support [\#576](https://github.com/hsz/idea-gitignore/issues/576)
 - Fixed deprecation warnings [\#567](https://github.com/hsz/idea-gitignore/issues/567)
+- Removed "tracked & ignored" feature [\#547](https://github.com/hsz/idea-gitignore/issues/547) [\#523](https://github.com/hsz/idea-gitignore/issues/523) [\#528](https://github.com/hsz/idea-gitignore/issues/528) [\#486](https://github.com/hsz/idea-gitignore/issues/486)
 
 **Fixed bugs:**
 

README.md

@@ -132,6 +132,7 @@ Changelog
 - .gcloudignore (Google Cloud) support [\#577](https://github.com/hsz/idea-gitignore/issues/577)
 - .nuxtignore (Nuxt.js) support [\#576](https://github.com/hsz/idea-gitignore/issues/576)
 - Fixed deprecation warnings [\#567](https://github.com/hsz/idea-gitignore/issues/567)
+- Removed "tracked & ignored" feature [\#547](https://github.com/hsz/idea-gitignore/issues/547) [\#523](https://github.com/hsz/idea-gitignore/issues/523) [\#528](https://github.com/hsz/idea-gitignore/issues/528) [\#486](https://github.com/hsz/idea-gitignore/issues/486)
 
 **Fixed bugs:**
 

resources/META-INF/plugin.xml

@@ -83,6 +83,7 @@
             <li>.gcloudignore (Google Cloud) support (<a href="https://github.com/hsz/idea-gitignore/issues/577">577</a>)</li>
             <li>.nuxtignore (Nuxt.js) support (<a href="https://github.com/hsz/idea-gitignore/issues/576">576</a>)</li>
             <li>Fixed deprecation warnings (<a href="https://github.com/hsz/idea-gitignore/issues/567">567</a>)</li>
+            <li>Removed "tracked & ignored" feature (<a href="https://github.com/hsz/idea-gitignore/issues/547">547</a>, <a href="https://github.com/hsz/idea-gitignore/issues/523">523</a>, <a href="https://github.com/hsz/idea-gitignore/issues/528">528</a>, <a href="https://github.com/hsz/idea-gitignore/issues/486">486</a>)</li>
         </ul>
 
         <i>Fixed bugs:</i>
@@ -547,10 +548,6 @@
         <component>
             <implementation-class>mobi.hsz.idea.gitignore.IgnoreUpdateComponent</implementation-class>
         </component>
-        <component>
-            <implementation-class>mobi.hsz.idea.gitignore.TrackedIgnoredFilesComponent</implementation-class>
-            <loadForDefaultProject/>
-        </component>
         <component>
             <implementation-class>mobi.hsz.idea.gitignore.IgnoreFileBasedIndexProjectHandler</implementation-class>
         </component>
@@ -590,9 +587,5 @@
         <action id="HideIgnoredFiles" class="mobi.hsz.idea.gitignore.actions.HideIgnoredFilesAction">
             <add-to-group group-id="ProjectViewPopupMenu"/>
         </action>
-
-        <action id="HandleTrackedIgnoredFiles" class="mobi.hsz.idea.gitignore.actions.HandleTrackedIgnoredFilesAction">
-            <add-to-group group-id="ProjectViewPopupMenu"/>
-        </action>
     </actions>
 </idea-plugin>

resources/messages/IgnoreBundle.properties

@@ -122,7 +122,6 @@ settings.general.outerIgnoreRules=Show &outer ignore rules in editor (Git only)
 settings.general.insertAtCursor=Insert new ignore entries at cursor &position
 settings.general.addUnversionedFiles=Suggest to add &unversioned files (Git only)
 settings.general.unignoreFiles=Enable unignore files group (add entries prefixed with !)
-settings.general.informTrackedIgnored=Inform about ignored files that are still tracked (Git only)
 settings.general.notifyIgnoredEditing=Inform about editing ignored file
 settings.general.donate=Donate me with:
 settings.userTemplates=User templates
@@ -151,16 +150,14 @@ action.importTemplates.error=User templates import failed.
 
 notification.group=.ignore plugin
 notification.group.update=.ignore plugin update information
-notification.untrack.title=Ignored files found that are tracked
-notification.untrack.content=<b>.ignore</b> plugin found some files that are tracked with Git \
-  which are also listed in .gitignore file. <a href="#">Show details</a> <a href="#disable">Don't show</a>
 notification.update.title=<b>.ignore</b> plugin updated to v{0}
 notification.update.content=<br/>\
 Helpful? <b><a href="https://www.paypal.me/hsz">Donate with PayPal</a> or <a href="https://opencollective.com/ignore">OpenCollective!</a></b><br/><br/>\
 Implemented enhancements:<br/>\
 - .gcloudignore (Google Cloud) support (#577)<br/>\
 - .nuxtignore (Nuxt.js) support (#576)<br/>\
 - Fixed deprecation warnings (#567)<br/>\
+- Removed "tracked & ignored" feature (#547 #523, #528, #486)<br/>\
 Fixes:<br/>\
 - Adding 2+ templates without new line in between (#561)<br/>\
 <br/>\

src/mobi/hsz/idea/gitignore/IgnoreManager.java

@@ -452,8 +452,8 @@ public static void associateFileType(@NotNull final String fileName, @NotNull fi
      * @return file is ignored and tracked
      */
     public boolean isFileTracked(@NotNull final VirtualFile file) {
-        return settings.isInformTrackedIgnored() && !notConfirmedIgnoredFiles.contains(file) &&
-                !confirmedIgnoredFiles.isEmpty() && confirmedIgnoredFiles.containsKey(file);
+        return !notConfirmedIgnoredFiles.contains(file) && !confirmedIgnoredFiles.isEmpty() &&
+                confirmedIgnoredFiles.containsKey(file);
     }
 
     /**
@@ -560,16 +560,6 @@ private void toggle(@NotNull Boolean enable) {
         }
     }
 
-    /**
-     * Returns tracked and ignored files stored in {@link #confirmedIgnoredFiles}.
-     *
-     * @return tracked and ignored files map
-     */
-    @NotNull
-    public ConcurrentMap<VirtualFile, VcsRoot> getConfirmedIgnoredFiles() {
-        return confirmedIgnoredFiles;
-    }
-
     /** {@link Runnable} implementation to rebuild {@link #confirmedIgnoredFiles}. */
     class RefreshTrackedIgnoredRunnable implements Runnable, IgnoreManager.RefreshTrackedIgnoredListener {
         /** Default {@link Runnable} run method that invokes rebuilding with bus event propagating. */
@@ -590,10 +580,6 @@ public void refresh() {
          * @param silent propagate {@link IgnoreManager.TrackedIgnoredListener#TRACKED_IGNORED} event
          */
         public void run(boolean silent) {
-            if (!settings.isInformTrackedIgnored()) {
-                return;
-            }
-
             final ConcurrentMap<VirtualFile, VcsRoot> result = ContainerUtil.newConcurrentMap();
             for (VcsRoot vcsRoot : vcsRoots) {
                 if (!(vcsRoot.getVcs() instanceof GitVcs) || vcsRoot.getPath() == null) {

src/mobi/hsz/idea/gitignore/indexing/IgnoreFilesIndex.java

@@ -194,18 +194,6 @@ public boolean acceptInput(@NotNull VirtualFile file) {
                 IgnoreManager.FILE_TYPES_ASSOCIATION_QUEUE.containsKey(file.getName());
     }
 
-    /**
-     * Returns collection of indexed {@link IgnoreFileTypeKey} for given {@link Project}.
-     *
-     * @param project current project
-     * @return {@link IgnoreFileTypeKey} collection
-     */
-    @NotNull
-    public static Collection<IgnoreFileType> getKeys(@NotNull Project project) {
-        Collection<IgnoreFileTypeKey> keys = FileBasedIndex.getInstance().getAllKeys(KEY, project);
-        return ContainerUtil.map(keys, IgnoreFileTypeKey::getType);
-    }
-
     /**
      * Returns collection of indexed {@link IgnoreEntryOccurrence} for given {@link Project} and {@link IgnoreFileType}.
      *

src/mobi/hsz/idea/gitignore/projectView/IgnoreViewNodeDecorator.java

@@ -85,7 +85,7 @@ public void decorate(ProjectViewNode node, PresentationData data) {
             return;
         }
 
-        if (ignoreSettings.isInformTrackedIgnored() && manager.isFileTracked(file) && manager.isFileIgnored(file)) {
+        if (manager.isFileTracked(file) && manager.isFileIgnored(file)) {
             Utils.addColoredText(
                     data,
                     IgnoreBundle.message("projectView.tracked"),