diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java b/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java index 9d7a966..73af44e 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java @@ -66,7 +66,7 @@ public static Map getActionParams(YAMLKeyValue element) { } else if (element.getValue() instanceof YAMLBlockMappingImpl yamlBlockMapping) { for (PsiElement child = yamlBlockMapping.getFirstChild(); child != null; child = child.getNextSibling()) { if (child instanceof YAMLKeyValue yamlKeyValue && yamlKeyValue.getValue() instanceof YAMLScalar) { - params.put(yamlKeyValue.getKeyText(),yamlKeyValue.getValueText()); + params.put(yamlKeyValue.getKeyText(), yamlKeyValue.getValueText()); } } return params; diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java b/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java index d8cea1b..b80bb90 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java @@ -30,9 +30,9 @@ public class PubspecRunScriptAction extends AnAction { public static final String TERMINAL_KEY = "terminal"; public PubspecRunScriptAction( - @Nullable @NlsActions.ActionText String text, - @Nullable @NlsActions.ActionDescription String description, - @Nullable Icon icon + @Nullable @NlsActions.ActionText String text, + @Nullable @NlsActions.ActionDescription String description, + @Nullable Icon icon ) { super(text, description, icon); } @@ -50,10 +50,10 @@ public void actionPerformed(@NotNull AnActionEvent e) { String workingDirectory = file.getVirtualFile().getParent().getPath(); if (params.containsKey(DIRECTORY_KEY)) { workingDirectory = Paths.get(workingDirectory) - .resolve(params.get(DIRECTORY_KEY)) - .normalize() - .toAbsolutePath() - .toString(); + .resolve(params.get(DIRECTORY_KEY)) + .normalize() + .toAbsolutePath() + .toString(); } Boolean executeInTerminal = null; if (params.containsKey(TERMINAL_KEY)) { @@ -65,12 +65,12 @@ public void actionPerformed(@NotNull AnActionEvent e) { } PubspecTerminalHelper.runScript( - this.getExecutor(), - e.getData(CommonDataKeys.PROJECT), - element.getKeyText(), - scriptText, - workingDirectory, - executeInTerminal); + this.getExecutor(), + e.getData(CommonDataKeys.PROJECT), + element.getKeyText(), + scriptText, + workingDirectory, + executeInTerminal); } } } diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptConfigurationType.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptConfigurationType.java index b8e6935..a3b8de0 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptConfigurationType.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptConfigurationType.java @@ -17,9 +17,9 @@ public class DartScriptConfigurationType extends SimpleConfigurationType { DartScriptConfigurationType() { super( - ID, CONFIGURATION_NAME, - DartBundle.message("ds.run.configuration.description.0.configuration", CONFIGURATION_NAME), - NotNullLazyValue.createConstantValue(DartIcons.ScriptIcon) + ID, CONFIGURATION_NAME, + DartBundle.message("ds.run.configuration.description.0.configuration", CONFIGURATION_NAME), + NotNullLazyValue.createConstantValue(DartIcons.ScriptIcon) ); } diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfiguration.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfiguration.java index db46101..e990185 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfiguration.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfiguration.java @@ -88,8 +88,8 @@ private static void writePathWithMetadata(@NotNull Element element, @NotNull Str private static String readPathWithMetadata(@NotNull Element element, @NotNull String pathTag) { return Boolean.parseBoolean(JDOMExternalizerUtil.readField(element, TAG_PREFIX + pathTag)) - ? readStringTagValue(element, pathTag) - : FileUtil.toSystemDependentName(readStringTagValue(element, pathTag)); + ? readStringTagValue(element, pathTag) + : FileUtil.toSystemDependentName(readStringTagValue(element, pathTag)); } @NotNull diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfigurationEditor.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfigurationEditor.java index 519aede..60f4bac 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfigurationEditor.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunConfigurationEditor.java @@ -21,9 +21,9 @@ public class DartScriptRunConfigurationEditor extends SettingsEditor commandLine, @Nullable St ContainerUtil.addIfNotNull(commandLine, StringUtil.nullize(options)); } - private static void addIfPresent( - @NotNull List commandLine, - @NotNull Map envs - ) { + private static void addIfPresent(@NotNull List commandLine, @NotNull Map envs) { int index = 0; for (Map.Entry entry : envs.entrySet()) { String key = entry.getKey(); diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunner.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunner.java index aa5994c..400d30c 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunner.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunner.java @@ -6,11 +6,11 @@ public interface DartScriptRunner { void run( - @NotNull Project project, - @NotNull String command, - @NotNull String workingDirectory, - @NotNull @NlsContexts.TabTitle String title, - boolean activateToolWindow + @NotNull Project project, + @NotNull String command, + @NotNull String workingDirectory, + @NotNull @NlsContexts.TabTitle String title, + boolean activateToolWindow ); boolean isAvailable(@NotNull Project project); diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptTerminalRunner.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptTerminalRunner.java index 7d13a32..0eebb7e 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptTerminalRunner.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptTerminalRunner.java @@ -24,15 +24,15 @@ public class DartScriptTerminalRunner implements DartScriptRunner { private static final Logger logger = Logger.getInstance(DartScriptTerminalRunner.class); public void run( - @NotNull Project project, - @NotNull String command, - @NotNull String workingDirectory, - @NotNull @NlsContexts.TabTitle String title, - boolean activateToolWindow + @NotNull Project project, + @NotNull String command, + @NotNull String workingDirectory, + @NotNull @NlsContexts.TabTitle String title, + boolean activateToolWindow ) { TerminalToolWindowManager terminalView = TerminalToolWindowManager.getInstance(project); ToolWindow window = ToolWindowManager.getInstance(project) - .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID); + .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID); if (window == null) { return; } @@ -42,9 +42,9 @@ public void run( try { if (pair == null) { terminalView.createShellWidget( - workingDirectory, - title, - activateToolWindow, + workingDirectory, + title, + activateToolWindow, true ).sendCommandToExecute(command); return; @@ -62,13 +62,13 @@ public void run( public boolean isAvailable(@NotNull Project project) { ToolWindow window = ToolWindowManager.getInstance(project) - .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID); + .getToolWindow(TerminalToolWindowFactory.TOOL_WINDOW_ID); return window != null && window.isAvailable(); } private static @Nullable Pair getSuitableProcess( - @NotNull ContentManager contentManager, - @NotNull String workingDirectory + @NotNull ContentManager contentManager, + @NotNull String workingDirectory ) { Content selectedContent = contentManager.getSelectedContent(); if (selectedContent != null) { @@ -78,15 +78,15 @@ public boolean isAvailable(@NotNull Project project) { } return Arrays.stream(contentManager.getContents()) - .map(content -> getSuitableProcess(content, workingDirectory)) - .filter(Objects::nonNull) - .findFirst() - .orElse(null); + .map(content -> getSuitableProcess(content, workingDirectory)) + .filter(Objects::nonNull) + .findFirst() + .orElse(null); } private static @Nullable Pair getSuitableProcess( - @NotNull Content content, - @NotNull String workingDirectory + @NotNull Content content, + @NotNull String workingDirectory ) { JBTerminalWidget widget = TerminalToolWindowManager.getWidgetByContent(content); if (!(widget instanceof ShellTerminalWidget shellTerminalWidget)) diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java index 7ae6bb6..dce49e7 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java @@ -13,19 +13,19 @@ @UtilityClass public class PubspecTerminalHelper { public RunConfiguration runScript( - Executor executor, - Project project, - String name, - String script, - String workingDirectory, - Boolean executeInTerminal + Executor executor, + Project project, + String name, + String script, + String workingDirectory, + Boolean executeInTerminal ) { RunManager runManager = RunManager.getInstance(project); DartScriptConfigurationType configurationType = ConfigurationTypeUtil - .findConfigurationType(DartScriptConfigurationType.class); + .findConfigurationType(DartScriptConfigurationType.class); RunnerAndConfigurationSettings configurationSettings = runManager - .findConfigurationByTypeAndName(configurationType, name); + .findConfigurationByTypeAndName(configurationType, name); if (configurationSettings == null) { configurationSettings = runManager.createConfiguration(name, configurationType); runManager.addConfiguration(configurationSettings); @@ -38,7 +38,7 @@ public RunConfiguration runScript( runConfiguration.setScriptWorkingDirectory(workingDirectory); ExecutionEnvironmentBuilder builder = ExecutionEnvironmentBuilder - .createOrNull(executor, runConfiguration); + .createOrNull(executor, runConfiguration); if (builder != null) ExecutionManager.getInstance(project).restartRunProfile(builder.build()); diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/util/DartBundle.java b/src/main/java/com/joutvhu/intellij/dartscripts/util/DartBundle.java index 93e379b..5b29194 100644 --- a/src/main/java/com/joutvhu/intellij/dartscripts/util/DartBundle.java +++ b/src/main/java/com/joutvhu/intellij/dartscripts/util/DartBundle.java @@ -20,16 +20,16 @@ private DartBundle() { @NotNull @Nls public static String message( - @NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - @NotNull Object... params + @NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + @NotNull Object... params ) { return INSTANCE.getMessage(key, params); } @NotNull public static Supplier messagePointer( - @NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - @NotNull Object... params + @NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + @NotNull Object... params ) { return INSTANCE.getLazyMessage(key, params); } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index b1bff22..c173066 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,39 +1,39 @@ - com.joutvhu.intellij.dart-scripts - Dart Scripts Runner - Other Tools - Giao Ho + com.joutvhu.intellij.dart-scripts + Dart Scripts Runner + Other Tools + Giao Ho - - Support to run scripts in pubspec.yaml file with just one click.

-
- Run script on pubspec.yaml - ]]> - + + Support to run scripts in pubspec.yaml file with just one click.

+
+ Run script on pubspec.yaml + ]]> + - - Changelog
- Readme
- License
- ]]> - + + Changelog
+ Readme
+ License
+ ]]> + - - com.intellij.modules.platform - org.jetbrains.plugins.terminal - org.jetbrains.plugins.yaml + + com.intellij.modules.platform + org.jetbrains.plugins.terminal + org.jetbrains.plugins.yaml - - - - - - + + + + + + - + \ No newline at end of file diff --git a/src/main/resources/META-INF/pluginIcon.svg b/src/main/resources/META-INF/pluginIcon.svg index 1a26105..cb44af0 100644 --- a/src/main/resources/META-INF/pluginIcon.svg +++ b/src/main/resources/META-INF/pluginIcon.svg @@ -1,12 +1,28 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/icons/dartScript.svg b/src/main/resources/icons/dartScript.svg index b91e410..8ab2ed5 100644 --- a/src/main/resources/icons/dartScript.svg +++ b/src/main/resources/icons/dartScript.svg @@ -1,13 +1,13 @@ - - - - - - + + + + + + diff --git a/src/main/resources/messages/DartScriptsBundle.properties b/src/main/resources/messages/DartScriptsBundle.properties index c058154..e375556 100644 --- a/src/main/resources/messages/DartScriptsBundle.properties +++ b/src/main/resources/messages/DartScriptsBundle.properties @@ -1,9 +1,6 @@ ds.action.name.run=Run ''{0}'' - ds.run.configuration.description.0.configuration={0} configuration - ds.label.choose.script.working.directory=Choose Script Working Directory - ds.run.execute.script.text.title=Script text: ds.run.working.dir=Working directory: ds.run.working.dir.not.found=Working directory not found