Guard FileView recursion against file nodes

Author: lobre

src/FolderManager/FileView.vala

@@ -221,22 +221,31 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
                     return (!)item;
                 }
 
-                if (item is Code.Widgets.SourceList.ExpandableItem) {
-                    var expander = item as Code.Widgets.SourceList.ExpandableItem;
-                    if (!path.has_prefix (code_item.path)) {
-                        continue;
+                if (item is FolderItem) {
+                    var folder = item as FolderItem;
+                    var folder_path = folder.path;
+                    var ends_with_separator = folder_path.has_suffix (Path.DIR_SEPARATOR_S);
+                    if (ends_with_separator) {
+                        if (!path.has_prefix (folder_path) || path.length <= folder_path.length) {
+                            continue;
+                        }
+                    } else {
+                        var folder_prefix = folder_path + Path.DIR_SEPARATOR_S;
+                        if (!path.has_prefix (folder_prefix)) {
+                            continue;
+                        }
                     }
 
-                    if (!expander.expanded) {
+                    if (!folder.expanded) {
                          if (expand) {
-                             ((FolderItem)expander).load_children (); //Synchronous
-                             expander.expanded = true;
+                             folder.load_children (); //Synchronous
+                             folder.expanded = true;
                          } else {
                              continue;
                          }
                      }
 
-                    unowned var recurse_item = find_path (expander, path, expand);
+                    unowned var recurse_item = find_path (folder, path, expand);
                     if (recurse_item != null) {
                         return recurse_item;
                     }