MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[terminal] IDEA-338890 Complete file paths when there is no complete command

Browse Source 
So, it will become possible to execute shell scripts with the help of completion.

GitOrigin-RevId: ffbdf8758a675e6f9424aba79f495dd846ca7b44
This commit is contained in:
Konstantin Hudyakov
2023-11-27 17:44:38 +02:00
committed by intellij-monorepo-bot
parent 178ea11a93
commit f84740db07
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/terminal/completion/src/com/intellij/terminal/completion/CommandSpecCompletion.kt
View File

@@ -23,10 +23,9 @@ class CommandSpecCompletion(
if (commandTokens.isEmpty() || commandTokens.singleOrNull()?.isBlank() == true) {
return null // do not propose command suggestions if there is an empty command prefix
}
val suggestionsProvider = CommandTreeSuggestionsProvider(runtimeDataProvider)
if (commandTokens.size == 1) {
// command name is incomplete, so provide suggestions for commands
return suggestionsProvider.getAvailableCommands()
// command name is incomplete, so provide suggestions for commands and files
return computeCommandsAndFiles(commandTokens)
}
val command = commandTokens.first()
val arguments = commandTokens.subList(1, commandTokens.size)
@@ -35,19 +34,31 @@ class CommandSpecCompletion(
val completeArguments = arguments.subList(0, arguments.size - 1)
val lastArgument = arguments.last()
val suggestionsProvider = CommandTreeSuggestionsProvider(runtimeDataProvider)
val rootNode: SubcommandNode = CommandTreeBuilder.build(suggestionsProvider, commandSpecManager,
command, commandSpec, completeArguments)
return computeSuggestions(suggestionsProvider, rootNode, lastArgument)
}
private suspend fun computeCommandsAndFiles(commandTokens: List<String>): List<BaseSuggestion> {
assert(commandTokens.isNotEmpty())
val files = computeFileItems(commandTokens) ?: emptyList()
return if (commandTokens.last().contains("/")) {
files // cur token contains path delimiter, so it is a path, and we should not propose commands
}
else {
val suggestionsProvider = CommandTreeSuggestionsProvider(runtimeDataProvider)
val commands = suggestionsProvider.getAvailableCommands()
files + commands
}
}
/**
* Returns the file suggestions for the last argument from [commandTokens]
* But returns null if [commandTokens] length is less than 2,
* because it is strange to propose files when there is no complete command.
* Returns the file suggestions for the last argument from [commandTokens] if this list is not empty.
*/
suspend fun computeFileItems(commandTokens: List<String>): List<BaseSuggestion>? {
if (commandTokens.size < 2) {
return null // do not propose files if there is no complete command
if (commandTokens.isEmpty() || commandTokens.singleOrNull()?.isBlank() == true) {
return null
}
val suggestionsProvider = CommandTreeSuggestionsProvider(runtimeDataProvider)
val fakeArgument = ShellArgument(templates = listOf("filepaths"))