Skip to content

Commit 58aa91c

Browse files
committed
check configuration
1 parent 8e12090 commit 58aa91c

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

src/main/java/com/tang/intellij/lua/debugger/LuaRunConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.intellij.execution.configuration.AbstractRunConfiguration;
2020
import com.intellij.execution.configurations.ConfigurationFactory;
21+
import com.intellij.execution.configurations.RuntimeConfigurationError;
2122
import com.intellij.execution.configurations.RuntimeConfigurationException;
2223
import com.intellij.openapi.module.Module;
2324
import com.intellij.openapi.module.ModuleManager;
@@ -49,7 +50,7 @@ public void checkConfiguration() throws RuntimeConfigurationException {
4950
}
5051

5152
if (!sourceRootExist) {
52-
throw new RuntimeConfigurationException("Sources root not found.");
53+
throw new RuntimeConfigurationError("Sources root not found.");
5354
}
5455
}
5556
}

src/main/java/com/tang/intellij/lua/debugger/LuaRunConfigurationProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public boolean isConfigurationFromContext(LuaAppRunConfiguration luaAppRunConfig
5555
if (element == null)
5656
return false;
5757
PsiFile psiFile = element.getContainingFile();
58-
if (psiFile.getFileType() != LuaFileType.INSTANCE)
58+
if (psiFile == null || psiFile.getFileType() != LuaFileType.INSTANCE)
5959
return false;
6060
VirtualFile file = luaAppRunConfiguration.getVirtualFile();
6161
return psiFile.getVirtualFile().equals(file);

src/main/java/com/tang/intellij/lua/debugger/app/LuaAppRunConfiguration.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818

1919
import com.intellij.execution.ExecutionException;
2020
import com.intellij.execution.Executor;
21-
import com.intellij.execution.configurations.ConfigurationFactory;
22-
import com.intellij.execution.configurations.RunConfiguration;
23-
import com.intellij.execution.configurations.RunProfileState;
24-
import com.intellij.execution.configurations.RuntimeConfigurationException;
21+
import com.intellij.execution.configurations.*;
2522
import com.intellij.execution.runners.ExecutionEnvironment;
2623
import com.intellij.openapi.module.Module;
2724
import com.intellij.openapi.module.ModuleManager;
@@ -165,17 +162,17 @@ public void checkConfiguration() throws RuntimeConfigurationException {
165162
super.checkConfiguration();
166163
String program = getProgram();
167164
if (program == null || program.isEmpty()) {
168-
throw new RuntimeConfigurationException("Program doesn't exist.");
165+
throw new RuntimeConfigurationError("Program doesn't exist.");
169166
}
170167

171168
String workingDir = getWorkingDir();
172169
if (workingDir == null || !new File(workingDir).exists()) {
173-
throw new RuntimeConfigurationException("Working dir doesn't exist.");
170+
throw new RuntimeConfigurationError("Working dir doesn't exist.");
174171
}
175172

176173
VirtualFile virtualFile = getVirtualFile();
177174
if (virtualFile == null) {
178-
throw new RuntimeConfigurationException("Entry file doesn't exist.");
175+
throw new RuntimeConfigurationError("Entry file doesn't exist.");
179176
}
180177
}
181178
}

0 commit comments

Comments
 (0)