Refresh file view improvements

Author: rahmanusta

src/main/java/com/kodedu/controller/ApplicationController.java

@@ -557,7 +557,7 @@ public void refreshWorkingDir() {
         if (currentPath.isPresent()) {
             directoryService.changeWorkigDir(currentPath.get());
         } else {
-            fileBrowser.refresh();
+            fileBrowser.cleanRefresh();
         }
 
     }
@@ -3431,4 +3431,8 @@ public void showSupportAsciidocFX() {
             },true);
         }
     }
+
+    public void refreshFileView(ActionEvent actionEvent) {
+        fileBrowser.cleanRefresh();
+    }
 }

src/main/java/com/kodedu/service/ui/FileBrowseService.java

@@ -66,9 +66,15 @@ public FileBrowseService(final PathOrderService pathOrder, final ThreadService t
         this.current = current;
     }
 
-    public void refresh() {
+    public void cleanRefresh() {
         if (Objects.nonNull(browsedPath)) {
             cleanPathMaps();
+            refresh();
+        }
+    }
+
+    public void refresh() {
+        if (Objects.nonNull(browsedPath)) {
             browse(browsedPath);
             treeView.requestFocus();
         }
@@ -179,23 +185,7 @@ public void addPathToTree(Path path, final TreeItem<Item> treeItem, Path changed
 
                     restoreTreeSelectionState();
 
-                    if (Objects.nonNull(changedPath)) {
-                        TreeItem<Item> item = pathItemMap.get(changedPath);
-                        if (Objects.nonNull(item)) {
-                            treeView.getSelectionModel().clearSelection();
-                            treeView.getSelectionModel().select(item);
-                            if (Objects.equals(item, treeView.getSelectionModel().getSelectedItem())) {
-                                treeView.scrollTo(treeView.getSelectionModel().getSelectedIndex());
-                            }
-
-                            TreeItem<Item> parent = item.getParent();
-                            if (Objects.nonNull(parent)) {
-                                if (!parent.isExpanded()) {
-                                    parent.setExpanded(true);
-                                }
-                            }
-                        }
-                    }
+                    focusPath(changedPath);
 
                     fileWatchService.registerPathWatcher(path);
                 });
@@ -208,6 +198,27 @@ public void addPathToTree(Path path, final TreeItem<Item> treeItem, Path changed
 
     }
 
+    public void focusPath(Path path) {
+        if (Objects.nonNull(path)) {
+            TreeItem<Item> item = pathItemMap.get(path);
+            if (Objects.nonNull(item)) {
+                TreeItem<Item> parent = item.getParent();
+                while (Objects.nonNull(parent)) {
+                    if (!parent.isExpanded()) {
+                        parent.setExpanded(true);
+                    }
+                    parent = parent.getParent();
+                }
+
+                treeView.getSelectionModel().clearSelection();
+                treeView.getSelectionModel().select(item);
+                if (Objects.equals(item, treeView.getSelectionModel().getSelectedItem())) {
+                    treeView.scrollTo(treeView.getSelectionModel().getSelectedIndex());
+                }
+            }
+        }
+    }
+
     private void restoreTreeSelectionState() {
         MultipleSelectionModel<TreeItem<Item>> selectionModel = treeView.getSelectionModel();
         selectionModel.setSelectionMode(SelectionMode.MULTIPLE);
@@ -246,7 +257,7 @@ public void refreshPathToTree(Path path, Path changedPath) {
             treeView.setRoot(rootItem);
             rootItem.setExpanded(true);
             addPathToTree(browsedPath, rootItem, changedPath);
-            treeView.requestFocus();
+//            treeView.requestFocus();
         });
     }
 

src/main/java/com/kodedu/spell/dictionary/DictionaryService.java

@@ -92,9 +92,13 @@ public void processTokens(EditorPane editorPane, String jsonToken, String mode)
                     }
                 })
                 .peek(t -> {
-                    final List<String> suggestions = languageSpeller.findSuggestions(t.getValue());
-                    t.setEmptySuggestion(suggestions.isEmpty());
-                    suggestionMap.put(t.getValue(), suggestions);
+                    try {
+                        final List<String> suggestions = languageSpeller.findSuggestions(t.getValue());
+                        t.setEmptySuggestion(suggestions.isEmpty());
+                        suggestionMap.put(t.getValue(), suggestions);
+                    } catch (Exception e) {
+                        logger.info("Couldn't find suggestions for value {}", t.getValue(), e);
+                    }
                 })
                 .collect(Collectors.toList());
 

src/main/resources/scenes/AsciidocFX_Scene.fxml

@@ -241,6 +241,8 @@
                                                                     <items>
                                                                         <MenuItem fx:id="openFileTreeItem"
                                                                                   mnemonicParsing="false" text="Open"/>
+                                                                        <MenuItem onAction="#refreshFileView"
+                                                                                  mnemonicParsing="false" text="Refresh"/>
                                                                         <MenuItem id="openFolderTreeItem"
                                                                                   fx:id="openFolderTreeItem"
                                                                                   mnemonicParsing="false"