CreateMainClassAndOpenItInEditor #398
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package ${PACKAGE_NAME}; | ||
| class ${NAME} { | ||
| public static function main() { | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,8 @@ | |
| import com.intellij.openapi.progress.ProgressManager; | ||
| import com.intellij.openapi.progress.Task; | ||
| import com.intellij.openapi.project.Project; | ||
| import com.intellij.openapi.project.ProjectType; | ||
| import com.intellij.openapi.project.ProjectTypeService; | ||
| import com.intellij.openapi.projectRoots.Sdk; | ||
| import com.intellij.openapi.roots.ModifiableRootModel; | ||
| import com.intellij.openapi.roots.ModuleRootManager; | ||
|
|
@@ -40,6 +42,7 @@ | |
| import com.intellij.openapi.vfs.VfsUtil; | ||
| import com.intellij.openapi.vfs.VirtualFile; | ||
| import com.intellij.openapi.vfs.VirtualFileManager; | ||
| import com.intellij.plugins.haxe.config.sdk.HaxeSdkType; | ||
| import com.intellij.plugins.haxe.hxml.HXMLFileType; | ||
| import com.intellij.plugins.haxe.hxml.psi.HXMLClasspath; | ||
| import com.intellij.plugins.haxe.hxml.psi.HXMLLib; | ||
|
|
@@ -579,13 +582,20 @@ private HaxeClasspath getProjectClasspath(@NotNull ProjectTracker tracker) { | |
| @NotNull | ||
| private void syncProjectClasspath(@NotNull ProjectTracker tracker) { | ||
| HaxeDebugTimeLog timeLog = new HaxeDebugTimeLog("syncProjectClasspath"); | ||
| Project project = tracker.getProject(); | ||
| timeLog.stamp("Start synchronizing project " + project.getName()); | ||
|
|
||
| Sdk sdk = HaxelibSdkUtils.lookupSdk(project); | ||
| boolean isHaxeSDK = sdk.getSdkType().equals(HaxeSdkType.getInstance()); | ||
|
|
||
| if (!isHaxeSDK) { | ||
|
There was a problem hiding this comment. check which fixes #397 |
||
| return; | ||
| } | ||
|
|
||
| HaxelibLibraryCache libCache = tracker.getSdkManager().getLibraryCache(sdk); | ||
| HaxeClasspath currentProjectClasspath = HaxelibClasspathUtils.getProjectLibraryClasspath( | ||
| project); | ||
| List<String> currentLibraryNames = HaxelibClasspathUtils.getProjectLibraryNames(project, true); | ||
| HaxeClasspath haxelibClasspaths = libCache.getClasspathForHaxelibs(currentLibraryNames); | ||
|
|
||
| // Libraries that we want to remove are those specified as 'haxelib' entries and are | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,18 +17,41 @@ | |
| */ | ||
| package com.intellij.plugins.haxe.ide.module; | ||
|
|
||
| import com.intellij.execution.RunManager; | ||
| import com.intellij.execution.RunnerAndConfigurationSettings; | ||
| import com.intellij.execution.configurations.ConfigurationFactory; | ||
| import com.intellij.execution.configurations.ConfigurationTypeUtil; | ||
| import com.intellij.execution.configurations.RunConfiguration; | ||
| import com.intellij.ide.util.projectWizard.JavaModuleBuilder; | ||
| import com.intellij.ide.util.projectWizard.ModuleBuilderListener; | ||
| import com.intellij.ide.util.projectWizard.SourcePathsBuilder; | ||
| import com.intellij.openapi.application.ApplicationManager; | ||
| import com.intellij.openapi.fileEditor.FileEditorManager; | ||
| import com.intellij.openapi.module.Module; | ||
| import com.intellij.openapi.module.ModuleType; | ||
| import com.intellij.openapi.options.ConfigurationException; | ||
| import com.intellij.openapi.project.Project; | ||
| import com.intellij.openapi.projectRoots.SdkTypeId; | ||
| import com.intellij.openapi.roots.CompilerModuleExtension; | ||
| import com.intellij.openapi.roots.ModifiableRootModel; | ||
| import com.intellij.openapi.util.Pair; | ||
| import com.intellij.openapi.vfs.VfsUtil; | ||
| import com.intellij.openapi.vfs.VfsUtilCore; | ||
| import com.intellij.openapi.vfs.VirtualFile; | ||
| import com.intellij.openapi.vfs.VirtualFileManager; | ||
| import com.intellij.plugins.haxe.config.HaxeTarget; | ||
| import com.intellij.plugins.haxe.config.sdk.HaxeSdkType; | ||
| import com.intellij.plugins.haxe.ide.HaxeFileTemplateUtil; | ||
| import com.intellij.plugins.haxe.module.impl.HaxeModuleSettingsBaseImpl; | ||
| import com.intellij.plugins.haxe.runner.HaxeApplicationConfiguration; | ||
| import com.intellij.plugins.haxe.runner.HaxeRunConfigurationType; | ||
| import com.intellij.psi.PsiManager; | ||
| import com.intellij.util.PathUtil; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.io.File; | ||
| import java.util.List; | ||
|
|
||
| public class HaxeModuleBuilder extends JavaModuleBuilder implements SourcePathsBuilder, ModuleBuilderListener { | ||
| @Override | ||
| public void setupRootModel(ModifiableRootModel modifiableRootModel) throws ConfigurationException { | ||
|
|
@@ -51,6 +74,75 @@ public void moduleCreated(@NotNull Module module) { | |
| final CompilerModuleExtension model = (CompilerModuleExtension)CompilerModuleExtension.getInstance(module).getModifiableModel(true); | ||
|
There was a problem hiding this comment. So, the idea is that every time a module is created, we simply go ahead and create a Main.hx class in it? There was a problem hiding this comment. I tested it and seems like you are right |
||
| model.setCompilerOutputPath(model.getCompilerOutputUrl()); | ||
| model.inheritCompilerOutputPath(false); | ||
|
|
||
| final Project project = module.getProject(); | ||
| List<Pair<String, String>> sourcePaths = getSourcePaths(); | ||
| String srcPath = null; | ||
|
|
||
| if ((sourcePaths.size() > 0)) { | ||
| srcPath = sourcePaths.get(0).getFirst(); | ||
|
There was a problem hiding this comment. We get There was a problem hiding this comment. I'm not so thrilled about just adding it to the first source path. In fact, I'm not sure that we should be generating a file at all. I would think that adding a main method to an existing class would be enough -- and the more useful -- help. (And, in reality, I thought you were only going to put up a warning dialog.) There was a problem hiding this comment. I think it is more friendly, because you would have to create Main class/method/file anyway (at least I do that, especially when I am developing this=) there are should be a way to create unit tests for it ) There was a problem hiding this comment. I like the idea of a QuickFix to add a main() method to a class. I guess I don't really mind the ability to add a new class, either. The trouble is that we're creating that class every time we create a new module. And new modules aren't necessarily empty; they can be created from existing sources. Always adding a new file is what really bothers me. I think this functionality can exist, but NOT in the module create function. |
||
| VirtualFile dir = VirtualFileManager.getInstance().findFileByUrl(VfsUtilCore.pathToUrl(srcPath)); | ||
|
|
||
| if (dir != null) { | ||
| try { | ||
| VirtualFile mainClassFile = dir.findFileByRelativePath("Main.hx"); | ||
| if (mainClassFile == null) { | ||
| HaxeFileTemplateUtil | ||
| .createClass("Main", "", PsiManager.getInstance(project).findDirectory(dir), "HaxeMainClass", | ||
| null); | ||
| } | ||
| } | ||
| catch (Exception e) { | ||
|
There was a problem hiding this comment. Are you sure you want to catch /every/ exception? I'd much prefer catching only the exception that the code can throw. Also, if we just continue after the exception, then we are changing settings to work with a non-existent class. The best course of action is to catch recoverable errors and let the rest fly past. |
||
| e.printStackTrace(); | ||
| } | ||
| } | ||
|
|
||
| HaxeModuleSettings moduleSettings = HaxeModuleSettings.getInstance(module); | ||
| moduleSettings.setMainClass("Main"); | ||
| moduleSettings.setArguments(""); | ||
| moduleSettings.setNmeFlags(""); | ||
| moduleSettings.setHaxeTarget(HaxeTarget.NEKO); | ||
|
There was a problem hiding this comment. I really dislike forcing the project into a different mode just because we added a class. That doesn't make any sense to me. There was a problem hiding this comment. That is mostly default settings, not much is changed - mainly Main class stuff There was a problem hiding this comment. Wouldn't you rather duplicate the settings from related modules. I mean, if the user is targeting OpenFL, shouldn't we make that the default for the new module as well? But maybe we never did that in the first place... There was a problem hiding this comment. That is interesting, I just don't use multiple modules, so I don't know how it is in practical sense There was a problem hiding this comment. Out project(s) have something like 80 modules, depending upon the target. Basically, we think of modules as libraries. We have them compile into their own haxelibs, but they are part of the larger project so that we can traverse the sources easily. Each one of them should not have a main class. From: as3boyan [mailto:[email protected]] In src/common/com/intellij/plugins/haxe/ide/module/HaxeModuleBuilder.javahttps://github.com//pull/398#discussion_r51614372:
That is interesting, I just don't use multiple modules, so I don't know how it is in practical sense — This email and any attachments may contain confidential and privileged material for the sole use of the intended recipient. Any review, copying, or distribution of this email (or any attachments) by others is prohibited. If you are not the intended recipient, please contact the sender immediately and permanently delete this email and any attachments. No employee or agent of TiVo Inc. is authorized to conclude any binding agreement on behalf of TiVo Inc. by email. Binding agreements with TiVo Inc. may only be made by a signed written agreement. There was a problem hiding this comment. I see, yeah, it needs to be flexible |
||
| moduleSettings.setExcludeFromCompilation(false); | ||
| moduleSettings.setBuildConfig(HaxeModuleSettingsBaseImpl.USE_PROPERTIES); | ||
| moduleSettings.setOutputFileName("Main.n"); | ||
| String outputFolder = PathUtil.toSystemIndependentName(project.getBasePath() + "/out/production"); | ||
| moduleSettings.setOutputFolder(outputFolder); | ||
| //String releaseFolder = PathUtil.toSystemIndependentName(outputFolder + "/release"); | ||
| //boolean mkdirs = new File(releaseFolder).mkdirs(); | ||
|
|
||
| String url = VfsUtil.pathToUrl(outputFolder); | ||
| model.setCompilerOutputPath(url); | ||
|
|
||
| assert dir != null; | ||
| final VirtualFile file = dir.findFileByRelativePath("Main.hx"); | ||
| assert (file != null); | ||
|
|
||
| ApplicationManager.getApplication().runWriteAction(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| FileEditorManager.getInstance(project).openFile(file, true); | ||
| } | ||
| }); | ||
|
|
||
| ConfigurationFactory[] factories = | ||
| ConfigurationTypeUtil.findConfigurationType(HaxeRunConfigurationType.class).getConfigurationFactories(); | ||
|
|
||
| if ((factories.length > 0)) { | ||
| RunConfiguration configuration = factories[0].createTemplateConfiguration(project); | ||
| RunManager manager = RunManager.getInstance(project); | ||
| RunnerAndConfigurationSettings runnerAndConfigurationSettings = manager.createConfiguration(configuration, factories[0]); | ||
| RunConfiguration configuration1 = runnerAndConfigurationSettings.getConfiguration(); | ||
| if (configuration1 instanceof HaxeApplicationConfiguration) { | ||
| HaxeApplicationConfiguration haxeApplicationConfiguration = (HaxeApplicationConfiguration)configuration1; | ||
| haxeApplicationConfiguration.setModule(module); | ||
| } | ||
| manager.addConfiguration(runnerAndConfigurationSettings, false); | ||
| manager.setSelectedConfiguration(runnerAndConfigurationSettings); | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| model.commit(); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be invisible to user, only for project generation