Skip to content

Commit c38934a

Browse files
committed
dart ref tweaks
1 parent 6026ce6 commit c38934a

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

src/ServiceStackIDEA/.idea/workspace.xml

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackAction.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.intellij.util.PlatformUtils;
2020
import org.jetbrains.annotations.NotNull;
2121

22+
import java.io.File;
2223
import java.util.ArrayList;
2324
import java.util.List;
2425

@@ -155,14 +156,14 @@ public void update(AnActionEvent e) {
155156
return;
156157
}
157158

158-
if (!(PlatformUtils.isIntelliJ() || isAndroidProject(module))) {
159+
if (!(PlatformUtils.isIntelliJ() || isAndroidProject(module) || isDartProject(module))) {
159160
e.getPresentation().setVisible(false);
160161
return;
161162
}
162163

163164
boolean isMavenModule = IDEAPomFileHelper.isMavenModule(module);
164165

165-
if (isAndroidProject(module) || isMavenModule) {
166+
if (isAndroidProject(module) || isMavenModule || isDartProject(module)) {
166167
e.getPresentation().setEnabled(true);
167168
} else {
168169
e.getPresentation().setEnabled(false);
@@ -192,6 +193,10 @@ private static boolean isAndroidProject(@NotNull Module module) {
192193
return false;
193194
}
194195

196+
private static boolean isDartProject(@NotNull Module module) {
197+
return GradleBuildFileHelper.isDartProject(module);
198+
}
199+
195200
static Module getModule(AnActionEvent e) {
196201
Module module = e.getData(LangDataKeys.MODULE);
197202
if (module == null) {
@@ -201,4 +206,5 @@ static Module getModule(AnActionEvent e) {
201206
return module;
202207
}
203208
}
209+
204210
}

src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static void handleOk(String addressUrl, String qualifiedPackageName,
5555

5656
String dtoPath;
5757
try {
58-
dtoPath = getDtoPath(module,qualifiedPackageName,selectedDirectory, fileName,errorMessage);
58+
dtoPath = getDtoPath(module,qualifiedPackageName, selectedDirectory, fileName, errorMessage);
5959
} catch (Exception e) {
6060
return;
6161
}
@@ -160,15 +160,15 @@ private static String getDtoPath(Module module, String qualifiedPackageName, Str
160160
String fullDtoPath;
161161

162162
PsiPackage mainPackage = JavaPsiFacade.getInstance(module.getProject()).findPackage(qualifiedPackageName);
163-
if(mainPackage != null && mainPackage.isValid() && mainPackage.getDirectories().length > 0) {
163+
if (mainPackage != null && mainPackage.isValid() && mainPackage.getDirectories().length > 0) {
164164
File file = new File(selectedDirectory);
165165
VirtualFile selectedFolder = LocalFileSystem.getInstance().findFileByIoFile(file);
166-
if(selectedFolder == null) {
166+
if (selectedFolder == null) {
167167
errorMessage.append("Unable to determine path for DTO file.");
168168
throw new FileNotFoundException();
169169
}
170170
PsiDirectory rootPackageDir = PsiManager.getInstance(module.getProject()).findDirectory(selectedFolder);
171-
if(rootPackageDir == null) {
171+
if (rootPackageDir == null) {
172172
errorMessage.append("Unable to determine path for DTO file.");
173173
throw new FileNotFoundException();
174174
}

0 commit comments

Comments
 (0)