Fixed typo (issue: #47), fixed small bugs

mesour · mesour · commit d16cbcb6532b · 2020-11-22T10:41:10.000+01:00
diff --git a/src/main/java/cz/jiripudil/intellij/nette/tester/TesterIcons.java b/src/main/java/cz/jiripudil/intellij/nette/tester/TesterIcons.java
@@ -6,9 +6,9 @@
 
 public class TesterIcons {
     /** file icon */
-    public static final Icon RUN_CLASS = IconLoader.getIcon("/src/main/resources/icons/runClass.png");
-    public static final Icon RUN_METHOD = IconLoader.getIcon("/src/main/resources/icons/runMethod.png");
-    public static final Icon RUN = IconLoader.getIcon("/src/main/resources/icons/run.png");
-    public static final Icon TESTER_CONFIG = IconLoader.getIcon("/src/main/resources/icons/testConfig.png");
+    public static final Icon RUN_CLASS = IconLoader.getIcon("/icons/runClass.png");
+    public static final Icon RUN_METHOD = IconLoader.getIcon("/icons/runMethod.png");
+    public static final Icon RUN = IconLoader.getIcon("/icons/run.png");
+    public static final Icon TESTER_CONFIG = IconLoader.getIcon("/icons/testConfig.png");
 
 }
diff --git a/src/main/java/cz/jiripudil/intellij/nette/tester/TesterUtil.java b/src/main/java/cz/jiripudil/intellij/nette/tester/TesterUtil.java
@@ -134,7 +134,7 @@ public static void doNotify(
             @NotNull NotificationType type,
             @Nullable Project project
     ) {
-        Notification notification = new Notification(NOTIFICATION_GROUP, title, content, NotificationType.ERROR);
+        Notification notification = new Notification(NOTIFICATION_GROUP, title, content, type);
         doNotify(notification, project);
     }
 
diff --git a/src/main/java/cz/jiripudil/intellij/nette/tester/configuration/TesterRunConfiguration.java b/src/main/java/cz/jiripudil/intellij/nette/tester/configuration/TesterRunConfiguration.java
@@ -1,9 +1,6 @@
 package cz.jiripudil.intellij.nette.tester.configuration;
 
-import com.intellij.execution.DefaultExecutionResult;
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.ExecutionResult;
-import com.intellij.execution.Executor;
+import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.process.ProcessTerminatedListener;
@@ -18,15 +15,16 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PathUtil;
 import com.intellij.util.xmlb.annotations.Attribute;
+import com.intellij.xdebugger.XDebugProcess;
+import com.intellij.xdebugger.XDebugSession;
 import com.jetbrains.php.config.PhpProjectConfigurationFacade;
 import com.jetbrains.php.config.commandLine.PhpCommandLinePathProcessor;
 import com.jetbrains.php.config.commandLine.PhpCommandSettings;
 import com.jetbrains.php.config.commandLine.PhpCommandSettingsBuilder;
 import com.jetbrains.php.config.interpreters.PhpInterpreter;
-import com.jetbrains.php.run.PhpCommandLineSettings;
-import com.jetbrains.php.run.PhpExecutionUtil;
-import com.jetbrains.php.run.PhpRefactoringListenerRunConfiguration;
-import com.jetbrains.php.run.PhpRunUtil;
+import com.jetbrains.php.debug.common.PhpDebugProcessFactory;
+import com.jetbrains.php.debug.xdebug.debugger.XdebugDriver;
+import com.jetbrains.php.run.*;
 import com.jetbrains.php.util.PhpConfigurationUtil;
 import com.jetbrains.php.util.pathmapper.PhpPathMapper;
 import cz.jiripudil.intellij.nette.tester.TesterBundle;
@@ -36,13 +34,17 @@
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.debugger.DebuggableRunConfiguration;
 
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-public class TesterRunConfiguration extends PhpRefactoringListenerRunConfiguration<TesterSettings> implements LocatableConfiguration {
+public class TesterRunConfiguration extends PhpRefactoringListenerRunConfiguration<TesterSettings> implements LocatableConfiguration, DebuggableRunConfiguration {
     private boolean isGenerated;
+    private String host = null;
 
     TesterRunConfiguration(@NotNull Project project, @NotNull ConfigurationFactory factory, String name) {
         super(project, factory, name);
@@ -105,7 +107,7 @@ public void checkConfiguration() throws RuntimeConfigurationException {
     @Override
     public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment executionEnvironment) throws ExecutionException {
         try {
-            return this.getState(executionEnvironment, this.createCommand(Collections.emptyMap(), Collections.emptyList(), false));
+            return this.getState(executionEnvironment, this.createCommand(Collections.emptyMap(), Collections.emptyList(), true));
         } catch (CloneNotSupportedException e) {
             return null;
         }
@@ -294,4 +296,20 @@ public void setValue(@Nullable String newName) {
 
         return pathsToUpdate;
     }
+
+    @Override
+    public @NotNull InetSocketAddress computeDebugAddress(RunProfileState state) throws ExecutionException {
+        if (host == null) {
+            return new InetSocketAddress(InetAddress.getLoopbackAddress(), 9000);
+        }
+        else {
+            return new InetSocketAddress(host, 9000);
+        }
+    }
+
+    @Override
+    public @NotNull XDebugProcess createDebugProcess(@NotNull InetSocketAddress inetSocketAddress, @NotNull XDebugSession session, @Nullable ExecutionResult result, @NotNull ExecutionEnvironment executionEnvironment) throws ExecutionException {
+        //XdebugDriver
+        return PhpDebugProcessFactory.forExternalConnection(session, inetSocketAddress.toString(), XdebugDriver.INSTANCE);
+    }
 }
diff --git a/src/main/java/cz/jiripudil/intellij/nette/tester/inspections/TestCaseIsRunInspection.java b/src/main/java/cz/jiripudil/intellij/nette/tester/inspections/TestCaseIsRunInspection.java
@@ -68,17 +68,17 @@ public void inspectionStarted(@NotNull LocalInspectionToolSession session, boole
 
     @Override
     public void inspectionFinished(@NotNull LocalInspectionToolSession session, @NotNull ProblemsHolder problemsHolder) {
-        if ( ! (session.getFile() instanceof PhpFile)) {
+        if (!(session.getFile() instanceof PhpFile)) {
             return;
         }
 
         testClasses.forEach((PhpClass testClass) -> {
-            if ( ! runReferencedClassNames.contains(testClass.getFQN())) {
-                ExtendsList extendsList = testClass.getExtendsList();
-                TextRange highlightRange = new TextRange(0, extendsList.getStartOffsetInParent() + extendsList.getTextLength());
+            if (!runReferencedClassNames.contains(testClass.getFQN())) {
                 problemsHolder.registerProblem(
-                    testClass, TesterBundle.message("inspections.runTestCase.description"), ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
-                    highlightRange, ADD_RUN_METHOD_CALL_QUICK_FIX, ! testClass.isFinal() ? MAKE_ABSTRACT_QUICK_FIX : null
+                    testClass.getNameIdentifier() != null ? testClass.getNameIdentifier() : testClass,
+                    TesterBundle.message("inspections.runTestCase.description"),
+                    ADD_RUN_METHOD_CALL_QUICK_FIX,
+                    !testClass.isFinal() ? MAKE_ABSTRACT_QUICK_FIX : null
                 );
             }
         });
diff --git a/src/main/resources/META-INF/change-notes.html b/src/main/resources/META-INF/change-notes.html
@@ -1,4 +1,10 @@
 <html>
+<h2>2.1.1</h2>
+<ul>
+    <li>Added Gradle (improvement for development)</li>
+    <li>Fixed typo (issue: #47)</li>
+</ul>
+
 <h2>2.1.0</h2>
 <ul>
     <li>Added run line markers to run TestCase or test methods</li>
diff --git a/src/main/resources/messages/TesterBundle.properties b/src/main/resources/messages/TesterBundle.properties
@@ -62,11 +62,11 @@ runConfiguration.editor.cli.title=Command Line
 runConfiguration.editor.cli.interpreterOptions=Interpreter options:
 runConfiguration.editor.cli.workingDirectory=Custom working directory:
 
-runConfiguration.mainConfiguration.missing.title=Run configuration 'tester' missing
-runConfiguration.mainConfiguration.missing.description=To use line markers, you need create run configuration named 'tester' with interpreter.
+runConfiguration.mainConfiguration.missing.title=Run configuration 'tests' missing
+runConfiguration.mainConfiguration.missing.description=To use line markers, you need create run configuration named 'tests' with interpreter.
 
-runConfiguration.mainConfiguration.invalid.title=Run configuration 'tester' is invalid
-runConfiguration.mainConfiguration.invalid.description=To use line markers, you need valid run configuration named 'tester'.
+runConfiguration.mainConfiguration.invalid.title=Run configuration 'tests' is invalid
+runConfiguration.mainConfiguration.invalid.description=To use line markers, you need valid run configuration named 'tests'.
 
 runConfiguration.mainConfiguration.alreadyCreated.title=Run configuration already created
 runConfiguration.mainConfiguration.alreadyCreated.description=Run configuration already exists. It can not be created again.

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public static void doNotify(`
`134`	`134`	`@NotNull NotificationType type,`
`135`	`135`	`@Nullable Project project`
`136`	`136`	`) {`
`137`		`- Notification notification = new Notification(NOTIFICATION_GROUP, title, content, NotificationType.ERROR);`
	`137`	`+ Notification notification = new Notification(NOTIFICATION_GROUP, title, content, type);`
`138`	`138`	`doNotify(notification, project);`
`139`	`139`	`}`
`140`	`140`