Merge remote-tracking branch 'origin/master' into 3.3/editorFixes

Conflicts: build/testModules/mpsTestModules.xml build/tests/mpsActions.xml build/tests/mpsBaseLanguage.xml build/tests/mpsBehavior.xml build/tests/mpsBuild.xml build/tests/mpsDataFlow.xml build/tests/mpsEditor.xml build/tests/mpsEditorDiagram.xml build/tests/mpsEditorImageGen.xml build/tests/mpsExecution.xml build/tests/mpsGenerator.xml build/tests/mpsImplementationStripping.xml build/tests/mpsPackaged.xml build/tests/mpsSModel.xml core/project/source/jetbrains/mps/project/Solution.java plugins/mps-build/languages/build.mps.tests/generator/template/jetbrains/mps/build/mps/tests/generator/template/main@generator.mps plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/generatedTests/mpsTestModules.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsActions.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBaseLanguage.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBehavior.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsBuild.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsDataFlow.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditor.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorDiagram.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsEditorImageGen.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsExecution.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsGenerator.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsImplementationStripping.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsPackaged.xml plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/tests/mpsSModel.xml
JetBrains · Nov 16, 2015 · 49f8a14 · 49f8a14
2 parents 6c83ed0 + c28d773
commit 49f8a14
Show file tree

Hide file tree

Showing 750 changed files with 36,806 additions and 69,818 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/IdeaPlugin/.idea/encodings.xml b/IdeaPlugin/.idea/encodings.xml
diff --git a/IdeaPlugin/.idea/libraries/mps_environment.xml b/IdeaPlugin/.idea/libraries/mps_environment.xml
diff --git a/IdeaPlugin/mps-core/META-INF/plugin.xml b/IdeaPlugin/mps-core/META-INF/plugin.xml
@@ -130,6 +130,9 @@
     <component>
       <implementation-class>jetbrains.mps.idea.core.project.ModuleIdSynchronizer</implementation-class>
     </component>
+    <component>
+      <implementation-class>jetbrains.mps.idea.core.refactoring.RegisterMoveNodePsiParticipant</implementation-class>
+    </component>
   </project-components>
 
   <extensionPoints>

diff --git a/IdeaPlugin/mps-core/jps-plugin/mps-jps-plugin.iml b/IdeaPlugin/mps-core/jps-plugin/mps-jps-plugin.iml
@@ -31,11 +31,20 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="TEST" name="jpsPlatformTests" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/jps-builders.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="mps-tool" level="project" />
     <orderEntry type="library" name="mps-collections" level="project" />
     <orderEntry type="library" name="mps-platform" level="project" />
     <orderEntry type="library" name="mps-closures" level="project" />
     <orderEntry type="library" name="mps-tuples" level="project" />
+    <orderEntry type="library" scope="TEST" name="jpsPlatformTests" level="project" />
   </component>
 </module>
diff --git a/IdeaPlugin/mps-core/jps-plugin/src/jetbrains/mps/jps/model/JpsMPSRepositoryFacade.java b/IdeaPlugin/mps-core/jps-plugin/src/jetbrains/mps/jps/model/JpsMPSRepositoryFacade.java
@@ -234,7 +234,7 @@ private void initProject(CompileContext context) {
       if (module == solutionIdea) {
         solutionIdea.updateModelsSet();
       }
-      myProject.addModule(solutionIdea.getModuleReference());
+      myProject.addModule(solutionIdea);
 
       myJpsToMpsModules.put(mod, solutionIdea);
 

diff --git a/IdeaPlugin/mps-core/jps-plugin/src/jetbrains/mps/jps/project/JpsMPSProject.java b/IdeaPlugin/mps-core/jps-plugin/src/jetbrains/mps/jps/project/JpsMPSProject.java
@@ -1,6 +1,7 @@
 package jetbrains.mps.jps.project;
 
-import jetbrains.mps.project.Project;
+import jetbrains.mps.project.structure.project.ProjectDescriptor;
+import jetbrains.mps.project.ProjectBase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.JpsProject;
 
@@ -11,17 +12,18 @@
  * danilla 12/10/12
  */
 
-public class JpsMPSProject extends Project {
+public class JpsMPSProject extends ProjectBase {
 
   JpsProject myProject;
 
   public JpsMPSProject(@NotNull JpsProject project) {
+    super(new ProjectDescriptor(project.getName()));
     myProject = project;
   }
 
   @Override
-  public List<String> getWatchedModulesPaths() {
-    return new ArrayList<String>();
+  public void save() {
+
   }
 
   @Override

diff --git a/IdeaPlugin/mps-core/mps-core.iml b/IdeaPlugin/mps-core/mps-core.iml
@@ -39,5 +39,6 @@
     <orderEntry type="library" scope="TEST" name="lang.test.runtime" level="project" />
     <orderEntry type="library" name="mps-tool" level="project" />
     <orderEntry type="library" name="mps-closures" level="project" />
+    <orderEntry type="library" name="mps-environment" level="project" />
   </component>
 </module>
diff --git a/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/facet/MPSFacet.java b/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/facet/MPSFacet.java
@@ -71,7 +71,7 @@ public void run() {
             }
 
             repository.registerModule(mySolution = solution, myMpsProject);
-            myMpsProject.addModule(mySolution.getModuleReference());
+            myMpsProject.addModule(mySolution);
             LOG.info(MPSBundle.message("facet.module.loaded", MPSFacet.this.mySolution.getModuleName()));
             IdeaPluginDescriptor descriptor = PluginManager.getPlugin(PluginManager.getPluginByClassName(MPSFacet.class.getName()));
             String version = descriptor == null ? null : descriptor.getVersion();
@@ -87,11 +87,13 @@ public void disposeFacet() {
     if (!wasInitialized()) {
       return;
     }
-    ModelAccess.instance().runWriteAction(new Runnable() {
+    myMpsProject.getModelAccess().runWriteAction(new Runnable() {
       @Override
       public void run() {
         LOG.info(MPSBundle.message("facet.module.unloaded", mySolution.getModuleName()));
-        MPSModuleRepository.getInstance().unregisterModule(mySolution, myMpsProject);
+        if (!myMpsProject.isDisposed()) {
+          MPSModuleRepository.getInstance().unregisterModule(mySolution, myMpsProject);
+        }
         mySolution = null;
       }
     });

diff --git a/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/project/ModuleRuntimeLibrariesImporter.java b/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/project/ModuleRuntimeLibrariesImporter.java
@@ -151,7 +151,7 @@ private void collectRuntimeDependencies(SModule module, Set<SModule> result) {
         return;
       }
       result.add(module);
-      for (SModule usedModule : GlobalModuleDependenciesManager.directlyUsedModules(module, Deptype.EXECUTE.reexportAll, Deptype.EXECUTE.runtimes)) {
+      for (SModule usedModule : GlobalModuleDependenciesManager.directlyUsedModules0(module, Deptype.EXECUTE.reexportAll, Deptype.EXECUTE.runtimes)) {
         collectRuntimeDependencies(usedModule, result);
       }
     }

diff --git a/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/project/module/SingleModuleMPSSupport.java b/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/project/module/SingleModuleMPSSupport.java
@@ -92,7 +92,7 @@ public void run() {
         }
 
         ((SRepositoryExt) repository).registerModule(solution, mpsProject);
-        mpsProject.addModule(solution.getModuleReference());
+        mpsProject.addModule(solution);
 
         mySolution = solution;
       }

diff --git a/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/psi/impl/MPSPsiModel.java b/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/psi/impl/MPSPsiModel.java
@@ -228,7 +228,7 @@ public PsiDirectory findSubdirectory(@NotNull String name) {
   @Nullable
   @Override
   public PsiFile findFile(@NotNull @NonNls String name) {
-    throw new IncorrectOperationException("Not implemented");
+    return null;
   }
 
   @Override

diff --git a/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/psi/impl/MPSPsiRootNode.java b/IdeaPlugin/mps-core/src/jetbrains/mps/idea/core/psi/impl/MPSPsiRootNode.java
@@ -20,7 +20,6 @@
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiBinaryFile;
 import com.intellij.psi.PsiDirectory;
@@ -30,15 +29,13 @@
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.SingleRootFileViewProvider;
 import com.intellij.psi.search.PsiElementProcessor;
-import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.IncorrectOperationException;
 import jetbrains.mps.fileTypes.MPSFileTypeFactory;
 import jetbrains.mps.ide.icons.IconManager;
 import jetbrains.mps.ide.icons.IdeIcons;
 import jetbrains.mps.ide.project.ProjectHelper;
 import jetbrains.mps.idea.core.projectView.edit.SNodeDeleteProvider;
 import jetbrains.mps.openapi.navigation.NavigationSupport;
-import jetbrains.mps.smodel.IOperationContext;
 import jetbrains.mps.smodel.MPSModuleRepository;
 import jetbrains.mps.smodel.ModelAccess;
 import jetbrains.mps.smodel.SNodePointer;
@@ -68,12 +65,12 @@ public class MPSPsiRootNode extends MPSPsiNodeBase implements PsiFile, PsiBinary
   private MPSPsiModel myModel;
   private VirtualFile mySeparateFile;
 
-  public MPSPsiRootNode (SNodeId nodeId, String name, MPSPsiModel containingModel, PsiManager manager) {
+  public MPSPsiRootNode(SNodeId nodeId, String name, MPSPsiModel containingModel, PsiManager manager) {
     this(nodeId, name, containingModel, manager, null);
     mySeparateFile = null;
   }
 
-  public MPSPsiRootNode (SNodeId nodeId, String name, MPSPsiModel containingModel, PsiManager manager, @Nullable VirtualFile virtualFile) {
+  public MPSPsiRootNode(SNodeId nodeId, String name, MPSPsiModel containingModel, PsiManager manager, @Nullable VirtualFile virtualFile) {
     super(manager);
     myNodeId = nodeId;
     myModel = containingModel;
@@ -90,7 +87,7 @@ protected Icon getBaseIcon() {
       @Override
       public Icon compute() {
         final SNode node = getSNodeReference().resolve(MPSModuleRepository.getInstance());
-        if(node == null) return IdeIcons.UNKNOWN_ICON;
+        if (node == null) return IdeIcons.UNKNOWN_ICON;
         return IconManager.getIconFor(node, true);
       }
     });
@@ -151,8 +148,9 @@ public boolean isDirectory() {
   @Nullable
   @Override
   public PsiDirectory getParent() {
-    if(myViewProvider.getVirtualFile().getFileType() == MPSFileTypeFactory.MPS_ROOT_FILE_TYPE && super.getParent() instanceof MPSPsiModel)
+    if (myViewProvider.getVirtualFile().getFileType() == MPSFileTypeFactory.MPS_ROOT_FILE_TYPE && super.getParent() instanceof MPSPsiModel) {
       return ((MPSPsiModel) super.getParent()).getParentDirectory();
+    }
     return (PsiDirectory) super.getParent();
   }
 
@@ -193,7 +191,7 @@ public String getName() {
   @NotNull
   @Override
   public PsiFile[] getPsiRoots() {
-    return new PsiFile[] {this};
+    return new PsiFile[]{this};
   }
 
   @NotNull