Skip to content

Commit

Permalink
Merge branch '2024.1'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	workbench/mps-platform/jetbrains.mps.ide.platform/source_gen/jetbrains/mps/ide/datatransfer/CopyPasteUtil.java
  • Loading branch information
@maros-sandor
maros-sandor committed Jul 9, 2024
2 parents 711f94e + e73529d commit 055a0b2
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 73 deletions.
38 changes: 24 additions & 14 deletions workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10404,14 +10404,20 @@
</node>
<node concept="tnohg" id="4npc6Q0ooI5" role="tncku">
<node concept="3clFbS" id="4npc6Q0ooI6" role="2VODD2">
<node concept="3clFbF" id="4npc6Q0ooZ9" role="3cqZAp">
<node concept="2YIFZM" id="5B4qHGk7JXl" role="3clFbG">
<ref role="37wK5l" to="dp1x:5tGs5KqKiIT" resolve="copyNodesToClipboard" />
<ref role="1Pybhc" to="dp1x:5tGs5KqKfGH" resolve="CopyPasteUtil" />
<node concept="2OqwBi" id="5B4qHGk7JXm" role="37wK5m">
<node concept="2WthIp" id="5B4qHGk7JXn" role="2Oq$k0" />
<node concept="3gHZIF" id="5B4qHGk7JXo" role="2OqNvi">
<ref role="2WH_rO" node="4npc6Q0ooIg" resolve="nodes" />
<node concept="3cpWs8" id="UjTWcK9s6v" role="3cqZAp">
<node concept="3cpWsn" id="UjTWcK9s6w" role="3cpWs9">
<property role="TrG5h" value="transferable" />
<node concept="3uibUv" id="UjTWcK9rYe" role="1tU5fm">
<ref role="3uigEE" to="dp1x:5tGs5KqKj2K" resolve="SNodeTransferable" />
</node>
<node concept="2YIFZM" id="UjTWcK9s6x" role="33vP2m">
<ref role="37wK5l" to="dp1x:5tGs5KqKiIT" resolve="copyNodesToClipboard" />
<ref role="1Pybhc" to="dp1x:5tGs5KqKfGH" resolve="CopyPasteUtil" />
<node concept="2OqwBi" id="UjTWcK9s6y" role="37wK5m">
<node concept="2WthIp" id="UjTWcK9s6z" role="2Oq$k0" />
<node concept="3gHZIF" id="UjTWcK9s6$" role="2OqNvi">
<ref role="2WH_rO" node="4npc6Q0ooIg" resolve="nodes" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -10477,13 +10483,17 @@
</node>
</node>
</node>
<node concept="3clFbF" id="4Z_ZrCET8$$" role="3cqZAp">
<node concept="2OqwBi" id="4Z_ZrCETa_O" role="3clFbG">
<node concept="2YIFZM" id="4Z_ZrCETatm" role="2Oq$k0">
<ref role="37wK5l" to="dp1x:oR0qGlKAkB" resolve="getPasteNodeData" />
<ref role="1Pybhc" to="dp1x:5tGs5KqKfGH" resolve="CopyPasteUtil" />
<node concept="3clFbF" id="4npc6Q0ooZ9" role="3cqZAp">
<node concept="2OqwBi" id="UjTWcKba4B" role="3clFbG">
<node concept="2OqwBi" id="UjTWcKb9t0" role="2Oq$k0">
<node concept="37vLTw" id="UjTWcK9s6_" role="2Oq$k0">
<ref role="3cqZAo" node="UjTWcK9s6w" resolve="transferable" />
</node>
<node concept="liA8E" id="UjTWcKb9XO" role="2OqNvi">
<ref role="37wK5l" to="dp1x:5tGs5KqKj7n" resolve="createNodeData" />
</node>
</node>
<node concept="liA8E" id="4Z_ZrCETaKo" role="2OqNvi">
<node concept="liA8E" id="UjTWcKbahQ" role="2OqNvi">
<ref role="37wK5l" to="qzxn:~PasteNodeData.consume()" resolve="consume" />
</node>
</node>
Expand Down
2 changes: 1 addition & 1 deletion ...nch/mps-workbench/jetbrains.mps.ide/source_gen.caches/jetbrains/mps/ide/actions/generated
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<product version="3" modelHash="-bqovmktx2bgoop29nfylsnoo7it6yy2">
<product version="3" modelHash="1aov6wwg8nblrj9xneslxnw0pgr4fgm">
<files names="AbstractFileActions_ActionGroup.java:AnalyzeModule_ActionGroup.java:AnalyzeStacktraceDialog.java:AnalyzeStacktrace_Action.java:Analyze_ActionGroup.java:BehaviorDialogsPersistentOptions_PreferencesComponent.java:BehaviourPopup_ActionGroup.java:Bookmarks_ActionGroup.java:Build_ActionGroup.java:CloneModelActionExecutor.java:CloneModel_Action.java:CloneModule_Action.java:CloneRoot_Action.java:CommonModuleActions_ActionGroup.java:ConvertToBinaryPersistence_Action.java:ConvertToDefaultPersistence_Action.java:ConvertToFilePerRootPersistence_Action.java:CopyModelName_Action.java:CopyModuleName_Action.java:CopyNodeName_Action.java:CopyNodeReference_Action.java:CopyNode_Action.java:CreateRootNodeAdapter_ActionGroup.java:CreateRootNode_ActionGroup.java:CutNode_Action.java:DebugActions_ActionGroup.java:DefaultBHMethodComparator.java:DefaultBHMethodNameFilter.java:DefaultConceptComparator.java:DefaultConceptNameFilter.java:Default_KeymapChanges.java:DeleteModels_Action.java:DeleteModules_Action.java:DeletePropertyAction_Action.java:DeleteReferenceAction_Action.java:DevkitActions_ActionGroup.java:EditGivenNode_Action.java:Edit_ActionGroup.java:EditorInternal_ActionGroup.java:EditorPopupEx_ActionGroup.java:EditorPopup_Show_ActionGroup.java:ExpandNode_Action.java:FastFindNodeUsages_Action.java:FileActions_ActionGroup.java:FileDelete_Action.java:FileSystemNewActions_ActionGroup.java:FindConceptInstances_Action.java:FindModelUsages_Action.java:FindModelUsages_ActionGroup.java:FindSpecificNodeUsages_Action.java:FindTextInProject_Action.java:FindUsagesHelper.java:FindUsages_ActionGroup.java:FixModuleImportsInProject_Action.java:FixModuleImports_Action.java:FolderActions_ActionGroup.java:ForceSaveAll_Action.java:GeneratorActions_ActionGroup.java:GeneratorNewActions_ActionGroup.java:GnomeActionsKeymap_KeymapChanges.java:GoByReference_ActionGroup.java:GoToAction_Action.java:GoToBookmark_Action.java:GoToConceptDescendants_Action.java:GoToFile_Action.java:GoToImplementationBehaviorMethod_Action.java:GoToModel_Action.java:GoToModule_Action.java:GoToNamedNode_Action.java:GoToRootNode_Action.java:GoToSuperBehaviorMethod_Action.java:Goto_ActionGroup.java:HighlightConstants.java:HighlightInstances_Action.java:HighlightUsages_Action.java:HighligterHook_ProjectPluginPart.java:Ide_ApplicationPlugin.java:Ide_ProjectPlugin.java:JUnitTestCaseActions_ActionGroup.java:JUnitTestMethodActions_ActionGroup.java:LanguageActions_ActionGroup.java:LanguageNewActions_ActionGroup.java:Line.java:MPSProjectPaths_Action.java:Mac_10_5_KeymapChanges.java:Mac_KeymapChanges.java:MappingDialog.java:MessagesViewActions_ActionGroup.java:ModelActions_ActionGroup.java:ModelCreationActionsBaseExecutor.java:ModelNamespaceInputValidator.java:ModelNewActions_ActionGroup.java:ModelProperties_Action.java:ModuleActions_ActionGroup.java:ModuleProperties_Action.java:MoveFileOrDirectory_Action.java:NamespaceActions_ActionGroup.java:NamespaceInternalActionsUtil.java:NamespaceInternalActions_ActionGroup.java:NamespaceMakeActions_ActionGroup.java:NamespaceNewActions_ActionGroup.java:NamespaceRenameHelper.java:NewDirectory_Action.java:NewElement_Action.java:NewFile_Action.java:NewModelActionExecutor.java:NewModel_Action.java:NewSolution_Action.java:NewSubModel_Action.java:NewSubTestModel_Action.java:NodeActions_ActionGroup.java:NodeNewActions_ActionGroup.java:OptimizeModelImports_Action.java:OptimizeModuleImports_Action.java:OptimizeProjectImports_Action.java:OverrideConceptMethodsAction.java:OverrideConceptMethodsDialog.java:OverrideConceptMethodsHelper.java:PackageActions_ActionGroup.java:PackageNewActions_ActionGroup.java:PasteNode_Action.java:PopupWithNodeEditor.java:PopupWithNodeEditorUI.java:PrintNodePosition_Action.java:PrintNodePosition_Addition_ActionGroup.java:ProjectActionsRenameProjectContainer_ActionGroup.java:ProjectActions_ActionGroup.java:ProjectNewActions_ActionGroup.java:ProjectPanePopupMenu_ActionGroup.java:PropertyNodeActions_ActionGroup.java:ReferenceNodeActions_ActionGroup.java:RemoveAllBookmarks_Action.java:RemoveModulesVirtualFolder_Action.java:RemoveTransientModels_Action.java:RemoveVirtualFolder_Action.java:RenameFileOrDirectory_Action.java:RenameModelsNamespace_Action.java:RenameModulesVirtualFolder_Action.java:RenamePackage_Action.java:RevertMemoryChanges_Action.java:SearchUsages_ActionGroup.java:Search_ActionGroup.java:SetBookmarkNoNumber_Action.java:SetBookmark_Action.java:SetNodePackageDialog.java:SetNodePackage_Action.java:SetVirtualFolder_Action.java:ShowBookmarksDialog_Action.java:ShowBookmarks_Action.java:ShowClassInHierarchy_Action.java:ShowConceptInHierarchy_Action.java:ShowDefinitionInMenu_Action.java:ShowDefinition_Action.java:ShowErrorMessage_Action.java:ShowInLogicalView_Action.java:ShowNodeInInspector_Action.java:ShowNodeInfo_Action.java:ShowParameters_Action.java:ShowQuickDocumentation_Action.java:SimplePopupWithNodeEditor.java:SolutionActions_ActionGroup.java:SolutionNewActions_ActionGroup.java:SolutionRefactoring_ActionGroup.java:StandaloneMPSStackTraceFilter.java:StringAction.java:StructurePopup_ActionGroup.java:StyledTextPrinterImpl.java:SubmitToTracker_Action.java:ToolsInternal_ActionGroup.java:Tools_ActionGroup.java:TouchBarDebug_ActionGroup.java:TouchBarDefault_alt_ActionGroup.java:TouchBarDefault_cmd_ActionGroup.java:TouchBarDefault_cmd_alt_ActionGroup.java:TouchBarDefault_shift_ActionGroup.java:TransientModulesActions_ActionGroup.java:View_ActionGroup.java:plugin.xml" />
</product>

5 changes: 3 additions & 2 deletions ...mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/CopyNode_Action.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import jetbrains.mps.ide.datatransfer.SNodeTransferable;
import jetbrains.mps.ide.datatransfer.CopyPasteUtil;

@GeneratedClass(node = "r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)/5033107305426684804", model = "r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)")
Expand Down Expand Up @@ -69,8 +70,8 @@ protected boolean collectActionData(AnActionEvent event, final Map<String, Objec
}
@Override
public void doExecute(@NotNull final AnActionEvent event, final Map<String, Object> _params) {
CopyPasteUtil.copyNodesToClipboard(((List<SNode>) MapSequence.fromMap(_params).get("nodes")));
SNodeTransferable transferable = CopyPasteUtil.copyNodesToClipboard(((List<SNode>) MapSequence.fromMap(_params).get("nodes")));
// sort of hack. indicate nodes copied into clipboard are present elsewhere (as if were cut and pasted back)
CopyPasteUtil.getPasteNodeData().consume();
transferable.createNodeData().consume();
}
}
114 changes: 58 additions & 56 deletions workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/trace.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8112,78 +8112,80 @@
</root>
<root nodeRef="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)/5033107305426684804">
<file name="CopyNode_Action.java">
<node id="5033107305426684804" at="23,0,24,0" concept="16" trace="ICON" />
<node id="5033107305426684804" at="25,28,26,28" concept="18" />
<node id="5033107305426684804" at="26,28,27,35" concept="6" />
<node id="5033107305426684804" at="27,35,28,52" concept="6" />
<node id="5033107305426684804" at="28,52,29,29" concept="6" />
<node id="5033107305426684804" at="32,32,33,16" concept="13" />
<node id="5376254339813257709" at="38,163,39,21" concept="13" />
<node id="5376254339813257714" at="41,5,42,16" concept="13" />
<node id="5033107305426684804" at="45,89,46,85" concept="6" />
<node id="5033107305426684804" at="50,53,51,19" concept="13" />
<node id="5033107305426684816" at="53,5,54,65" concept="12" />
<node id="5033107305426684816" at="55,26,56,56" concept="6" />
<node id="5033107305426684816" at="57,14,58,114" concept="6" />
<node id="8898893144448210383" at="60,26,61,21" concept="13" />
<node id="8898893144448210383" at="63,28,64,21" concept="13" />
<node id="5033107305426684816" at="65,7,66,0" concept="15" />
<node id="5033107305426684804" at="67,5,68,16" concept="13" />
<node id="5033107305426685897" at="71,96,72,98" concept="6" />
<node id="5757286674688421796" at="72,98,73,113" concept="14" />
<node id="5757286674688411940" at="73,113,74,47" concept="6" />
<node id="5033107305426684816" at="57,12,59,7" concept="1" />
<node id="5376254339813257657" at="37,105,40,7" concept="10" />
<node id="5033107305426684804" at="49,95,52,5" concept="10" />
<node id="8898893144448210383" at="59,7,62,7" concept="10" />
<node id="8898893144448210383" at="62,7,65,7" concept="10" />
<node id="5033107305426684804" at="31,0,35,0" concept="11" trace="isDumbAware#()Z" />
<node id="5033107305426684804" at="44,0,48,0" concept="11" trace="doUpdate#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
<node id="5376254339813257645" at="36,87,41,5" concept="9" />
<node id="5033107305426684816" at="54,65,59,7" concept="10" />
<node id="5033107305426684804" at="25,0,31,0" concept="3" trace="CopyNode_Action#()V" />
<node id="5033107305426684804" at="70,0,76,0" concept="11" trace="doExecute#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
<node id="5033107305426684804" at="35,0,44,0" concept="11" trace="isApplicable#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
<node id="5033107305426684816" at="52,5,67,5" concept="1" />
<node id="5033107305426684804" at="48,0,70,0" concept="11" trace="collectActionData#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
<scope id="5033107305426684804" at="32,32,33,16" />
<scope id="5376254339813257659" at="38,163,39,21" />
<scope id="5033107305426684804" at="45,89,46,85" />
<scope id="5033107305426684804" at="50,53,51,19" />
<scope id="5033107305426684816" at="55,26,56,56" />
<scope id="5033107305426684816" at="57,14,58,114" />
<scope id="8898893144448210383" at="60,26,61,21" />
<scope id="8898893144448210383" at="63,28,64,21" />
<scope id="5376254339813257648" at="37,105,40,7" />
<scope id="5033107305426684804" at="71,96,74,47" />
<scope id="5033107305426684804" at="25,28,29,29" />
<scope id="5033107305426684804" at="31,0,35,0" />
<scope id="5033107305426684804" at="44,0,48,0">
<node id="5033107305426684804" at="24,0,25,0" concept="16" trace="ICON" />
<node id="5033107305426684804" at="26,28,27,28" concept="18" />
<node id="5033107305426684804" at="27,28,28,35" concept="6" />
<node id="5033107305426684804" at="28,35,29,52" concept="6" />
<node id="5033107305426684804" at="29,52,30,29" concept="6" />
<node id="5033107305426684804" at="33,32,34,16" concept="13" />
<node id="5376254339813257709" at="39,163,40,21" concept="13" />
<node id="5376254339813257714" at="42,5,43,16" concept="13" />
<node id="5033107305426684804" at="46,89,47,85" concept="6" />
<node id="5033107305426684804" at="51,53,52,19" concept="13" />
<node id="5033107305426684816" at="54,5,55,65" concept="12" />
<node id="5033107305426684816" at="56,26,57,56" concept="6" />
<node id="5033107305426684816" at="58,14,59,114" concept="6" />
<node id="8898893144448210383" at="61,26,62,21" concept="13" />
<node id="8898893144448210383" at="64,28,65,21" concept="13" />
<node id="5033107305426684816" at="66,7,67,0" concept="15" />
<node id="5033107305426684804" at="68,5,69,16" concept="13" />
<node id="1050437963619877279" at="72,96,73,131" concept="12" />
<node id="5757286674688421796" at="73,131,74,113" concept="14" />
<node id="5033107305426685897" at="74,113,75,44" concept="6" />
<node id="5033107305426684816" at="58,12,60,7" concept="1" />
<node id="5376254339813257657" at="38,105,41,7" concept="10" />
<node id="5033107305426684804" at="50,95,53,5" concept="10" />
<node id="8898893144448210383" at="60,7,63,7" concept="10" />
<node id="8898893144448210383" at="63,7,66,7" concept="10" />
<node id="5033107305426684804" at="32,0,36,0" concept="11" trace="isDumbAware#()Z" />
<node id="5033107305426684804" at="45,0,49,0" concept="11" trace="doUpdate#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
<node id="5376254339813257645" at="37,87,42,5" concept="9" />
<node id="5033107305426684816" at="55,65,60,7" concept="10" />
<node id="5033107305426684804" at="26,0,32,0" concept="3" trace="CopyNode_Action#()V" />
<node id="5033107305426684804" at="71,0,77,0" concept="11" trace="doExecute#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)V" />
<node id="5033107305426684804" at="36,0,45,0" concept="11" trace="isApplicable#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
<node id="5033107305426684816" at="53,5,68,5" concept="1" />
<node id="5033107305426684804" at="49,0,71,0" concept="11" trace="collectActionData#(Lcom/intellij/openapi/actionSystem/AnActionEvent;Ljava/util/Map;)Z" />
<scope id="5033107305426684804" at="33,32,34,16" />
<scope id="5376254339813257659" at="39,163,40,21" />
<scope id="5033107305426684804" at="46,89,47,85" />
<scope id="5033107305426684804" at="51,53,52,19" />
<scope id="5033107305426684816" at="56,26,57,56" />
<scope id="5033107305426684816" at="58,14,59,114" />
<scope id="8898893144448210383" at="61,26,62,21" />
<scope id="8898893144448210383" at="64,28,65,21" />
<scope id="5376254339813257648" at="38,105,41,7" />
<scope id="5033107305426684804" at="72,96,75,44">
<var name="transferable" id="1050437963619877280" />
</scope>
<scope id="5033107305426684804" at="26,28,30,29" />
<scope id="5033107305426684804" at="32,0,36,0" />
<scope id="5033107305426684804" at="45,0,49,0">
<var name="_params" id="5033107305426684804" />
<var name="event" id="5033107305426684804" />
</scope>
<scope id="5376254339813257645" at="36,87,41,5">
<scope id="5376254339813257645" at="37,87,42,5">
<var name="node" id="5376254339813257646" />
</scope>
<scope id="5033107305426684804" at="25,0,31,0" />
<scope id="5376254339813180142" at="36,87,42,16" />
<scope id="5033107305426684804" at="70,0,76,0">
<scope id="5033107305426684804" at="26,0,32,0" />
<scope id="5376254339813180142" at="37,87,43,16" />
<scope id="5033107305426684804" at="71,0,77,0">
<var name="_params" id="5033107305426684804" />
<var name="event" id="5033107305426684804" />
</scope>
<scope id="5033107305426684804" at="35,0,44,0">
<scope id="5033107305426684804" at="36,0,45,0">
<var name="_params" id="5033107305426684804" />
<var name="event" id="5033107305426684804" />
</scope>
<scope id="5033107305426684816" at="53,5,66,0">
<scope id="5033107305426684816" at="54,5,67,0">
<var name="nodes" id="5033107305426684816" />
</scope>
<scope id="5033107305426684804" at="49,95,68,16" />
<scope id="5033107305426684804" at="48,0,70,0">
<scope id="5033107305426684804" at="50,95,69,16" />
<scope id="5033107305426684804" at="49,0,71,0">
<var name="_params" id="5033107305426684804" />
<var name="event" id="5033107305426684804" />
</scope>
<unit id="5033107305426684804" at="21,0,77,0" name="jetbrains.mps.ide.actions.CopyNode_Action" />
<unit id="5033107305426684804" at="22,0,78,0" name="jetbrains.mps.ide.actions.CopyNode_Action" />
</file>
<file name="Ide_ApplicationPlugin.java">
<node id="5033107305426684804" at="37,46,38,37" concept="6" />
Expand Down

0 comments on commit 055a0b2

Please sign in to comment.