Skip to content

Add name for console tab #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ellizio merged 2 commits into from
Nov 20, 2025
Merged

Add name for console tab #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
987f228
Bump to 2025.3 (#52)
ellizio Nov 15, 2025
517f15d
Added name for console tab
ellizio Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/UiBundle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import org.jetbrains.annotations.PropertyKey

private const val BUNDLE = "UiBundle"

object UiBundle : DynamicBundle(BUNDLE) {
fun text(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
object UiBundle {
private val instance = DynamicBundle(UiBundle::class.java, BUNDLE)

fun text(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = instance.getMessage(key, *params)
}
2 changes: 1 addition & 1 deletion src/rider/main/kotlin/ru/ellizio/odatacliui/actions/OpenCliDialogAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class OpenCliDialogAction : AnAction() {
{
var consoleView: ConsoleView?
withContext(Dispatchers.EDT) {
consoleView = CliToolWindowManager.getInstance(project).instantiateConsole()
consoleView = CliToolWindowManager.getInstance(project).instantiateConsole(model.serviceName.get())
}

val odataCliCommand = model.buildODataCliCommand()
Expand Down
8 changes: 5 additions & 3 deletions src/rider/main/kotlin/ru/ellizio/odatacliui/toolwindows/CliToolWindowManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ class CliToolWindowManager(private val project: Project) {
}
}

fun instantiateConsole(): ConsoleView {
fun instantiateConsole(serviceName: String): ConsoleView {
val consoleView = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
val content = toolWindow.contentManager.factory.createContent(consoleView.component, UiBundle.text("cli.tab.generate"), true)
content.setDisposer(consoleView);
val content = toolWindow.contentManager.factory.createContent(consoleView.component, UiBundle.text("cli.tab.generate", serviceName), true)
content.setDisposer(consoleView)

toolWindow.contentManager.addContent(content)
toolWindow.activate {
toolWindow.contentManager.setSelectedContent(content)
}

return consoleView
}
}
2 changes: 1 addition & 1 deletion src/rider/main/resources/UiBundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ cli.proxy.comment=Proxy settings
cli.ok-action-button.tooltip.not-installed=OData CLI not installed

# ToolWindow
cli.tab.generate=Generate
cli.tab.generate=Generate: {0}