Merge pull request #987 from Flow-Launcher/update_back_prev_dir_logic

jjw24 · web-flow · commit 520d2370db21 · 2022-01-20T21:04:20.000+11:00
[Dev] Add support for action keyword when using Ctrl + Backspace
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -506,12 +506,16 @@ private void OnKeyDown(object sender, KeyEventArgs e)
                     if (specialKeyState.CtrlPressed)
                     {
                         if (_viewModel.SelectedIsFromQueryResults()
-                            && QueryTextBox.CaretIndex == QueryTextBox.Text.Length
-                            && FilesFolders.IsLocationPathString(QueryTextBox.Text))
+                            && QueryTextBox.CaretIndex == QueryTextBox.Text.Length)
                         {
-
-                            _viewModel.BackspaceCommand.Execute(null);
-                            e.Handled = true;
+                            var queryWithoutActionKeyword = 
+                                QueryBuilder.Build(QueryTextBox.Text.Trim(), PluginManager.NonGlobalPlugins).Search;
+                            
+                            if (FilesFolders.IsLocationPathString(queryWithoutActionKeyword))
+                            {
+                                _viewModel.BackspaceCommand.Execute(null);
+                                e.Handled = true;
+                            }
                         }
                     }
                     break;
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -254,10 +254,14 @@ private void InitializeKeyCommands()
 
             BackspaceCommand = new RelayCommand(index =>
             {
-                var path = QueryText;
+                var query = QueryBuilder.Build(QueryText.Trim(), PluginManager.NonGlobalPlugins);
 
                 // GetPreviousExistingDirectory does not require trailing '\', otherwise will return empty string
-                ChangeQueryText(FilesFolders.GetPreviousExistingDirectory(FilesFolders.IsLocationPathString, path.TrimEnd('\\')));
+                var path = FilesFolders.GetPreviousExistingDirectory((_) => true, query.Search.TrimEnd('\\'));
+
+                var actionKeyword = string.IsNullOrEmpty(query.ActionKeyword) ? string.Empty : $"{query.ActionKeyword} ";
+
+                ChangeQueryText($"{actionKeyword}{path}");
             });
 
             LoadContextMenuCommand = new RelayCommand(_ =>
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -310,4 +310,4 @@ public void Update(List<ResultViewModel> newItems, CancellationToken token = def
             }
         }
     }
-}
+}
diff --git a/README.md b/README.md
@@ -215,17 +215,18 @@ And you can download <a href="https://github.com/Flow-Launcher/Flow.Launcher/dis
 
 | Hotkey                                                       | Description                                  |
 | ------------------------------------------------------------ | -------------------------------------------- |
-| <kbd>Alt</kbd>+ <kbd>Space</kbd>                             | Open Search Box (Default and Configurable)   |
+| <kbd>Alt</kbd>+ <kbd>Space</kbd>                             | Open Search Box (default and configurable)   |
 | <kbd>Enter</kbd>                                             | Execute                                      |
 | <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>Enter</kbd>            | Run As Admin                                 |
 | <kbd>↑</kbd><kbd>↓</kbd>                                     | Scroll up & Down                             |
 | <kbd>←</kbd><kbd>→</kbd>                                     | Back to Result / Open Context Menu           |
-| <kbd>Ctrl</kbd> +<kbd>o</kbd> , <kbd>Shift</kbd> +<kbd>Enter</kbd> | Open Context Menu                            |
-| <kbd>Tab</kbd>                                               | Autocomplete                    |
+| <kbd>Ctrl</kbd> +<kbd>o</kbd> , <kbd>Shift</kbd> +<kbd>Enter</kbd> | Open Context Menu                      |
+| <kbd>Tab</kbd>                                               | Autocomplete                                 |
 | <kbd>Esc</kbd>                                               | Back to Result & Close                       |
 | <kbd>Ctrl</kbd> +<kbd>i</kbd>                                | Open Setting Window                          |
 | <kbd>F5</kbd>                                                | Reload All Plugin Data & Window Search Index |
 | <kbd>Ctrl</kbd> + <kbd>h</kbd>                               | Open Query History                           |
+| <kbd>Ctrl</kbd> + <kbd>Backspace</kbd>                       | Back to Previous Directory                   |
 
 
 ## System Command List

Original file line number	Diff line number	Diff line change
`@@ -506,12 +506,16 @@ private void OnKeyDown(object sender, KeyEventArgs e)`
`506`	`506`	`if (specialKeyState.CtrlPressed)`
`507`	`507`	`{`
`508`	`508`	`if (_viewModel.SelectedIsFromQueryResults()`
`509`		`- && QueryTextBox.CaretIndex == QueryTextBox.Text.Length`
`510`		`- && FilesFolders.IsLocationPathString(QueryTextBox.Text))`
	`509`	`+ && QueryTextBox.CaretIndex == QueryTextBox.Text.Length)`
`511`	`510`	`{`
`512`		`-`
`513`		`- _viewModel.BackspaceCommand.Execute(null);`
`514`		`- e.Handled = true;`
	`511`	`+ var queryWithoutActionKeyword =`
	`512`	`+ QueryBuilder.Build(QueryTextBox.Text.Trim(), PluginManager.NonGlobalPlugins).Search;`
	`513`	`+`
	`514`	`+ if (FilesFolders.IsLocationPathString(queryWithoutActionKeyword))`
	`515`	`+ {`
	`516`	`+ _viewModel.BackspaceCommand.Execute(null);`
	`517`	`+ e.Handled = true;`
	`518`	`+ }`
`515`	`519`	`}`
`516`	`520`	`}`
`517`	`521`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -310,4 +310,4 @@ public void Update(List<ResultViewModel> newItems, CancellationToken token = def`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`	`}`
`313`		`-}`
	`313`	`+}`