mps/mps.git
18 months agoMPS-27804 - change incorrect dependencies to "Extends" master
Vaclav [Fri, 20 Apr 2018 08:23:23 +0000 (10:23 +0200)]
MPS-27804 - change incorrect dependencies to "Extends"

18 months agoupdate.xml for MPS 2018.1.1
Michael Vlassiev [Thu, 19 Apr 2018 11:13:24 +0000 (14:13 +0300)]
update.xml for MPS 2018.1.1

18 months agoMerge branch '2018.1'
Victor.Matchenko [Wed, 18 Apr 2018 15:27:42 +0000 (17:27 +0200)]
Merge branch '2018.1'

18 months agoMPS-27661 Let reporter edit exception before sending it to YouTrack 2018.1
Victor.Matchenko [Wed, 18 Apr 2018 14:28:20 +0000 (16:28 +0200)]
MPS-27661 Let reporter edit exception before sending it to YouTrack

Revert exception to be readonly.
Add ability to exclude stack trace from issue (this will be marked in issue description).

Text of agreement now can't be focused with tab switch.

18 months agoMPS-27718 ApplicationPluginManager: contributor ... is already registered
Artem Tikhomirov [Tue, 17 Apr 2018 11:58:11 +0000 (13:58 +0200)]
MPS-27718 ApplicationPluginManager: contributor ... is already registered

18 months agoMPS-27785 Using genContext.var as the parameter of the TemplateCallMacro leads to...
Artem Tikhomirov [Tue, 17 Apr 2018 11:38:31 +0000 (13:38 +0200)]
MPS-27785 Using genContext.var as the parameter of the TemplateCallMacro leads to the error while generation

18 months agoMPS-27798 User's action doUpdate method failed. Action: Show Node in Logical View
Artem Tikhomirov [Mon, 16 Apr 2018 18:17:54 +0000 (20:17 +0200)]
MPS-27798 User's action doUpdate method failed. Action: Show Node in Logical View

18 months agoMPS-27794 LOG.error(null) is not a friendly way to report errors
Artem Tikhomirov [Mon, 16 Apr 2018 15:20:53 +0000 (17:20 +0200)]
MPS-27794 LOG.error(null) is not a friendly way to report errors

Fix few cases when additional information might come handy.

18 months agoMerge remote-tracking branch 'origin/2018.1'
Michael Vlassiev [Tue, 17 Apr 2018 11:16:49 +0000 (14:16 +0300)]
Merge remote-tracking branch 'origin/2018.1'

18 months agoMPS-27802 Popup window with progress for each conflicted file when trying to resolve...
Michael Vlassiev [Tue, 17 Apr 2018 10:28:51 +0000 (13:28 +0300)]
MPS-27802 Popup window with progress for each conflicted file when trying to resolve conflicts

18 months agoMPS-26826 Copy/Paste no longer works in the merge dialog
Michael Vlassiev [Tue, 17 Apr 2018 09:21:21 +0000 (12:21 +0300)]
MPS-26826 Copy/Paste no longer works in the merge dialog

19 months agorun configurations: stay with original run configuration class, not UnknownRunConfigu...
Artem Tikhomirov [Mon, 16 Apr 2018 15:04:38 +0000 (17:04 +0200)]
run configurations: stay with original run configuration class, not UnknownRunConfiguration even if we know the factory is no longer valid

Classloading issues arise when a configuration instance is serialized, not instantiated.
To the moment, I didn't figure out what's the proper way to deal with invalid configurations (whether to use UnknownRunConfiguration or to report empty serialization Element).
Since it's tricky to check empty serialization at the moment (due to persistent configuration functionality subset, with no base class/isValid method), present approach is kept as it resembles previous state (with generated types and factories) quite close.
Once I've got better idea about IDEA's schemes, I need to get back to the code to finally fix classloading issues.

19 months agorun configurations: rebuild uses with new configuration factories
Artem Tikhomirov [Fri, 13 Apr 2018 16:01:16 +0000 (18:01 +0200)]
run configurations: rebuild uses with new configuration factories

19 months agorun configurations: replace generated config factory class with non-reloadable counte...
Artem Tikhomirov [Fri, 13 Apr 2018 15:46:23 +0000 (17:46 +0200)]
run configurations: replace generated config factory class with non-reloadable counterpart

ConfigFactoryEnvoy follows ConfigTypeEnvoy and is a non-reloadable representative of factory that provides Run Configurations from MPS plugins.
The factory knows when it's no longer valid (its 'activating' plugin/module has been unloaded) and tries to behave accordingly (though not sure UnknownRunConfiguration is the best way to do that)
Fix one of the gaps with 'foreign' factories that were never unregistered. They still lack proper (unique) id to get distinguished from other factories, but it's another issue.

19 months agoexec configuration producers: do not rely on specific factory class name
Artem Tikhomirov [Fri, 13 Apr 2018 12:47:06 +0000 (14:47 +0200)]
exec configuration producers: do not rely on specific factory class name

We are about to replace generated factories with a non-reloadable ConfigFactoryEnvoy class.

19 months agoexec configuration producers: shorten access to template settings
Artem Tikhomirov [Fri, 13 Apr 2018 08:43:01 +0000 (10:43 +0200)]
exec configuration producers: shorten access to template settings

there's no need to go through RunManagerImpl when appropriate method to access configuration template is present in API

19 months agoMerge branch '2018.1'
Victor.Matchenko [Fri, 13 Apr 2018 14:53:18 +0000 (16:53 +0200)]
Merge branch '2018.1'

19 months agoMPS-27661 Let reporter edit exception before sending it to YouTrack
Victor.Matchenko [Fri, 13 Apr 2018 11:51:40 +0000 (13:51 +0200)]
MPS-27661 Let reporter edit exception before sending it to YouTrack

Make exception editable.
Make user acknowledge and agree with data processing before submitting issue.
Add application info preview and ability to exclude it from issue.

19 months agoexec.configurations: shall not refer to ConfigurationType with fqn
Artem Tikhomirov [Thu, 12 Apr 2018 19:38:08 +0000 (21:38 +0200)]
exec.configurations: shall not refer to ConfigurationType with fqn

We no longer generate distinct class for ConfigurationType. Instead, it's represented with an instance of non-reloadable ConfigTypeEnvoy class,
and we shall match type instance by its id, not name fo generated class (which was stupid anyway).
Rebuild uses.

19 months agoexec.configurations: rebuild run configuration types with new templates
Artem Tikhomirov [Thu, 12 Apr 2018 13:08:41 +0000 (15:08 +0200)]
exec.configurations: rebuild run configuration types with new templates

Use non-reloadable class for run config type.

19 months agoexec.configurations: introduce an non-reloadable representative class for Configurati...
Artem Tikhomirov [Thu, 12 Apr 2018 13:02:39 +0000 (15:02 +0200)]
exec.configurations: introduce an non-reloadable representative class for ConfigurationType

We address an issue with mps module class reloading, when configuration kind class generated by MPS is reloaded but the old one is still accessible to IDEA due to its approach to extensions.

19 months agofix MPS-27780 Deadlock on make
Mihail Muhin [Thu, 12 Apr 2018 19:01:51 +0000 (22:01 +0300)]
fix MPS-27780 Deadlock on make

19 months agoMerge branch '2018.1'
Victor.Matchenko [Thu, 12 Apr 2018 12:35:42 +0000 (14:35 +0200)]
Merge branch '2018.1'

19 months agoplatform 181.4445: update version
Victor.Matchenko [Thu, 12 Apr 2018 10:36:49 +0000 (12:36 +0200)]
platform 181.4445: update version

Platform on top of Idea 2018.1.1 Release

19 months agobuild.mps.tests: do not include module source jars for JUnit classpath
Artem Tikhomirov [Wed, 11 Apr 2018 12:54:21 +0000 (14:54 +0200)]
build.mps.tests: do not include module source jars for JUnit classpath

19 months agoTransformationTest: drop TestRunner, unused
Artem Tikhomirov [Wed, 11 Apr 2018 11:55:36 +0000 (13:55 +0200)]
TransformationTest: drop TestRunner, unused

19 months agoRestore clipboard reset code
Artem Tikhomirov [Wed, 11 Apr 2018 11:43:58 +0000 (13:43 +0200)]
Restore clipboard reset code

Originally introduced in 2259b63feab03f6c484585020760e0993906352d, the code used to live in TransformationTestRunner which is about to cease existence.

19 months agoBaseMpsSuite: enviornment instance is managed explicitly since 2018.1, no need to...
Artem Tikhomirov [Wed, 11 Apr 2018 10:04:16 +0000 (12:04 +0200)]
BaseMpsSuite: enviornment instance is managed explicitly since 2018.1, no need to dispose one arter a test silently.

19 months agoDrop BseMpsTest, CoreMpsTest and PlatformMpsTest base class that are not in use since...
Artem Tikhomirov [Wed, 11 Apr 2018 10:01:46 +0000 (12:01 +0200)]
Drop BseMpsTest, CoreMpsTest and PlatformMpsTest base class that are not in use since 2018.1

19 months agoMPS-27517 Strange view of checkbox in New Build Solution
Victor.Matchenko [Thu, 22 Feb 2018 14:51:32 +0000 (15:51 +0100)]
MPS-27517 Strange view of checkbox in New Build Solution

CheckBoxCellRenderrer: Switch to BorderLayout (fixes original issue) and remove unnecessary overloads of getPreferredSize & doLayout methods.
Add border to checkbox to restore original view on Windows.
Make checkbox background transparent.
Syncronize a little bit with com.intellij.ui.CheckboxTreeBase.CheckboxTreeCellRendererBase to imrove look & feel on Windows 10.

Both TwoOptionsStep and CheckBoxCellRenderrer: Use JB components instead of Swing components

19 months agoMerge branch '181/vaclavVersion' into 182/vaclavMerge
Vaclav [Thu, 12 Apr 2018 08:41:12 +0000 (10:41 +0200)]
Merge branch '181/vaclavVersion' into 182/vaclavMerge

19 months agoMPS-27544 - fix the confluence urls
Vaclav [Thu, 5 Apr 2018 11:58:38 +0000 (13:58 +0200)]
MPS-27544 - fix the confluence urls

19 months agoMPS-27770 - prepend the name of the introduced variable with underscore, if it starts...
Vaclav [Thu, 12 Apr 2018 05:51:46 +0000 (07:51 +0200)]
MPS-27770 - prepend the name of the introduced variable with underscore, if it starts with a digit.

19 months agoMPS-27771 - select the message instead of the exception in MsgStatement and LogLowLev...
Vaclav [Wed, 11 Apr 2018 18:07:16 +0000 (20:07 +0200)]
MPS-27771 - select the message instead of the exception in MsgStatement and LogLowLevelStatement, when created through substitution

19 months agoMerge remote-tracking branch 'origin/2018.1'
Michael Vlassiev [Wed, 11 Apr 2018 12:08:18 +0000 (15:08 +0300)]
Merge remote-tracking branch 'origin/2018.1'

# Conflicts:
# IdeaPlugin/mps-core/META-INF/plugin.xml
# IdeaPlugin/mps-java/META-INF/plugin.xml
# IdeaPlugin/mps-migration/META-INF/plugin.xml
# IdeaPlugin/mps-vcs/META-INF/plugin.xml
# build/mps.xml
# build/mpsBootstrapCore.xml
# plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
# plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
# plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
# plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
# plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
# plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
# plugins/modelchecker/solution/modelchecker/actions.mps
# plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
# plugins/mps-build/META-INF/plugin.xml
# plugins/mps-build/solutions/mpsBuild/models/build.mps
# plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
# plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
# plugins/mps-testing/META-INF/plugin.xml
# plugins/mpsdevkit/solution/devkit/actions.mps
# plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
# plugins/mpsmake/make/actions.mps
# plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
# plugins/projectMigrations/META-INF/plugin.xml
# plugins/vcs/solutions/jetbrains.mps.ide.vcs/models/jetbrains/mps/vcs/plugin.mps
# plugins/vcs/solutions/jetbrains.mps.ide.vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
# plugins/vcs/source_gen.caches/jetbrains/mps/vcs/plugin/generated
# workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
# workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml

19 months agoupdate version to 2018.2
Michael Vlassiev [Wed, 11 Apr 2018 12:00:35 +0000 (15:00 +0300)]
update version to 2018.2

19 months agoMerge commit 'origin/2018.1~~'
Michael Vlassiev [Wed, 11 Apr 2018 11:29:56 +0000 (14:29 +0300)]
Merge commit 'origin/2018.1~~'

19 months agoMerge remote-tracking branch 'origin/2017.3' into 2018.1
Michael Vlassiev [Wed, 11 Apr 2018 11:28:02 +0000 (14:28 +0300)]
Merge remote-tracking branch 'origin/2017.3' into 2018.1

# Conflicts:
# IdeaPlugin/mps-core/META-INF/plugin.xml
# IdeaPlugin/mps-java/META-INF/plugin.xml
# IdeaPlugin/mps-migration/META-INF/plugin.xml
# IdeaPlugin/mps-vcs/META-INF/plugin.xml
# build/mps.xml
# build/mpsBootstrapCore.xml
# plugins/debugger-api/runtime/jetbrains/mps/debugger/api/ui/actions.mps
# plugins/debugger-api/runtime/source_gen/jetbrains/mps/debugger/api/ui/actions/plugin.xml
# plugins/debugger-java/customViewers/models/jetbrains/mps/debugger/java/customViewers/plugin/plugin.mps
# plugins/debugger-java/customViewers/source_gen/jetbrains/mps/debugger/java/customViewers/plugin/plugin/plugin.xml
# plugins/execution-configurations/plugin/models/plugin.mps
# plugins/execution-configurations/plugin/source_gen/jetbrains/mps/execution/configurations/implementation/plugin/plugin/plugin.xml
# plugins/execution-languages/languages/plugin/models/jetbrains/mps/execution/languages/plugin.mps
# plugins/execution-languages/languages/plugin/source_gen/jetbrains/mps/execution/languages/plugin/plugin.xml
# plugins/modelchecker/solution/modelchecker/actions.mps
# plugins/modelchecker/source_gen/jetbrains/mps/ide/modelchecker/actions/plugin.xml
# plugins/mps-build/META-INF/plugin.xml
# plugins/mps-build/solutions/mpsBuild/models/build.mps
# plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mps.xml
# plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsBootstrapCore.xml
# plugins/mps-testing/META-INF/plugin.xml
# plugins/mpsdevkit/solution/devkit/actions.mps
# plugins/mpsdevkit/source_gen/jetbrains/mps/ide/devkit/actions/plugin.xml
# plugins/mpsmake/make/actions.mps
# plugins/mpsmake/source_gen/jetbrains/mps/ide/make/actions/plugin.xml
# plugins/projectMigrations/META-INF/plugin.xml
# plugins/vcs/models/jetbrains/mps/vcs/plugin.mps
# plugins/vcs/source_gen/jetbrains/mps/vcs/plugin/plugin.xml
# workbench/mps-workbench/jetbrains.mps.ide/models/actions.mps
# workbench/mps-workbench/jetbrains.mps.ide/source_gen/jetbrains/mps/ide/actions/plugin.xml

19 months agoMPS-27764 Update version to 2018.1.1
Michael Vlassiev [Tue, 10 Apr 2018 11:51:53 +0000 (14:51 +0300)]
MPS-27764 Update version to 2018.1.1

19 months agoMPS-27763 Change platform version for all plugins to 181.1 - 182.*
Michael Vlassiev [Tue, 10 Apr 2018 10:07:44 +0000 (13:07 +0300)]
MPS-27763 Change platform version for all plugins to 181.1 - 182.*

19 months agoMPS-27747 Update version to 2017.3.7 2017.3
Michael Vlassiev [Wed, 11 Apr 2018 10:45:26 +0000 (13:45 +0300)]
MPS-27747 Update version to 2017.3.7

19 months agoDiff tests: don't dump file diff if whole file content has been replaced.
Artem Tikhomirov [Wed, 11 Apr 2018 08:05:03 +0000 (10:05 +0200)]
Diff tests: don't dump file diff if whole file content has been replaced.

19 months agoenvironment: access components through platform instead of statics.
Artem Tikhomirov [Tue, 10 Apr 2018 13:11:11 +0000 (15:11 +0200)]
environment: access components through platform instead of statics.

19 months agoMerge branch '2018.1'
Victor.Matchenko [Tue, 10 Apr 2018 11:27:02 +0000 (13:27 +0200)]
Merge branch '2018.1'

19 months agoMerge remote-tracking branch 'origin/2018.1'
Alexander Shatalin [Mon, 9 Apr 2018 12:57:44 +0000 (14:57 +0200)]
Merge remote-tracking branch 'origin/2018.1'

19 months agoupdate.xml for MPS 2017.3.6
Michael Vlassiev [Mon, 9 Apr 2018 11:53:25 +0000 (14:53 +0300)]
update.xml for MPS 2017.3.6

19 months agoplatform 181.4445: update version
Victor.Matchenko [Mon, 9 Apr 2018 11:15:26 +0000 (13:15 +0200)]
platform 181.4445: update version

19 months agoMPS-27748 MPS error wave painting is slow with new JDK
Alexander Shatalin [Fri, 6 Apr 2018 11:48:45 +0000 (13:48 +0200)]
MPS-27748 MPS error wave painting is slow with new JDK

19 months agoMPS-27751 - relieve the type-system constraints for the type of the SwitchStatement...
Vaclav [Fri, 6 Apr 2018 15:12:56 +0000 (17:12 +0200)]
MPS-27751 - relieve the type-system constraints for the type of the SwitchStatement's expression

19 months agoAlso storing logs and plugins in the same directory if the setting property is provid...
apyshkin [Thu, 5 Apr 2018 16:45:38 +0000 (19:45 +0300)]
Also storing logs and plugins in the same directory if the setting property is provided in the field

19 months agoMPS-27739, MPS-27740 Virtual machine parameters for MPS Application run configuration...
apyshkin [Thu, 5 Apr 2018 16:38:32 +0000 (19:38 +0300)]
MPS-27739, MPS-27740 Virtual machine parameters for MPS Application run configuration have no effect

19 months agoAdding typesystem rule to demand of providing all the required parameters when invoki...
apyshkin [Thu, 5 Apr 2018 15:59:48 +0000 (18:59 +0300)]
Adding typesystem rule to demand of providing all the required parameters when invoking a command

19 months agoMPS-27738 Reverting the rename of MPS rc into MPS Application rc in the 86bf001
apyshkin [Thu, 5 Apr 2018 14:43:50 +0000 (17:43 +0300)]
MPS-27738 Reverting the rename of MPS rc into MPS Application rc in the 86bf001

19 months agofinally remove exports annotations
Mihail Muhin [Fri, 6 Apr 2018 12:02:33 +0000 (15:02 +0300)]
finally remove exports annotations

19 months agofix MPS-25672: wrong explicit ":" typecast
Mihail Muhin [Thu, 5 Apr 2018 16:00:59 +0000 (19:00 +0300)]
fix MPS-25672: wrong explicit ":" typecast

19 months agoFix MPS-27750 Psi for root nodes in per-root persisted model not loaded when their...
Daniil Elovkov [Fri, 6 Apr 2018 13:45:45 +0000 (16:45 +0300)]
Fix MPS-27750 Psi for root nodes in per-root persisted model not loaded when their (root nodes') languages is absent

19 months agoupdate.xml for MPS 2018.1
Michael Vlassiev [Thu, 5 Apr 2018 11:47:51 +0000 (14:47 +0300)]
update.xml for MPS 2018.1

19 months agoupdate.xml for MPS 2018.1
Michael Vlassiev [Thu, 5 Apr 2018 11:42:38 +0000 (14:42 +0300)]
update.xml for MPS 2018.1

19 months agoMerge 2018.1
Daniil Elovkov [Wed, 4 Apr 2018 14:12:07 +0000 (17:12 +0300)]
Merge 2018.1

19 months agoFix MPS-27735 Unable to create mps module library 2018.1.0
Daniil Elovkov [Wed, 4 Apr 2018 14:05:27 +0000 (17:05 +0300)]
Fix MPS-27735 Unable to create mps module library

19 months agoMissing trace.info
Artem Tikhomirov [Wed, 4 Apr 2018 12:29:51 +0000 (14:29 +0200)]
Missing trace.info

19 months agoide.build, mpsBoostrapCore: apparently, both tool and environment modules manage...
Artem Tikhomirov [Tue, 3 Apr 2018 16:52:26 +0000 (18:52 +0200)]
ide.build, mpsBoostrapCore: apparently, both tool and environment modules manage generator settings and need its classes in classpath

19 months agotool.environment module doesn't need IDEA as its dependency, nor does it directly...
Artem Tikhomirov [Tue, 3 Apr 2018 16:40:56 +0000 (18:40 +0200)]
tool.environment module doesn't need IDEA as its dependency, nor does it directly reference any generator or persistence class

19 months agoide.build, mpsBoostrapCore: drop superfluous dependencies of mps-tool library
Artem Tikhomirov [Tue, 3 Apr 2018 16:28:00 +0000 (18:28 +0200)]
ide.build, mpsBoostrapCore: drop superfluous dependencies of mps-tool library

It consists of classes to pass idea/mps parameters between instances and few generic classes for workers (usually started with Ant).
There's no use of Ant classes nor from IDEA libraries. Besideds, dependency from generator classes is outdated as well (dates back to use of generation listener, perhaps?)

19 months agoMerge remote-tracking branch 'origin/2018.1'
Michael Vlassiev [Tue, 3 Apr 2018 20:36:38 +0000 (23:36 +0300)]
Merge remote-tracking branch 'origin/2018.1'

19 months agowhen executed "run migration assistant", do not try to show balloon instead of the...
Mihail Muhin [Tue, 3 Apr 2018 17:36:15 +0000 (20:36 +0300)]
when executed "run migration assistant", do not try to show balloon instead of the assistant

19 months agore-fix MPS-27439: make after changing generator
Mihail Muhin [Tue, 3 Apr 2018 16:45:09 +0000 (19:45 +0300)]
re-fix MPS-27439: make after changing generator

19 months agore-fix MPS-27439 console statement returning void leads to compilation errors when...
Mihail Muhin [Tue, 3 Apr 2018 15:57:31 +0000 (18:57 +0300)]
re-fix MPS-27439 console statement returning void leads to compilation errors when not inside BLCommand, add type for property's .remove operation

The problem with the previous fix was that old code became incompatible with new MPS version.

19 months agoMerge remote-tracking branch 'origin/2018.1' into simon-master
Semen Alperovich [Tue, 3 Apr 2018 15:58:55 +0000 (17:58 +0200)]
Merge remote-tracking branch 'origin/2018.1' into simon-master

# Conflicts:
# plugins/vcs-core/languages/mergehints/source_gen.caches/jetbrains/mps/vcs/mergehints/editor/dependencies
# plugins/vcs-core/languages/mergehints/source_gen/jetbrains/mps/vcs/mergehints/editor/trace.info

19 months agoMPS-27169 Update plugin to reflect svn4idea api changes (SVNKit removal) - disable...
Michael Vlassiev [Tue, 3 Apr 2018 16:38:53 +0000 (19:38 +0300)]
MPS-27169 Update plugin to reflect svn4idea api changes (SVNKit removal) - disable merge driver installation for SVN before it will be tested

19 months agoMerge remote-tracking branch 'origin/2018.1' into 181/simon
Semen Alperovich [Tue, 3 Apr 2018 15:35:03 +0000 (17:35 +0200)]
Merge remote-tracking branch 'origin/2018.1' into 181/simon

19 months agoMerge remote-tracking branch 'origin/2018.1'
Alexander Shatalin [Tue, 3 Apr 2018 14:37:44 +0000 (16:37 +0200)]
Merge remote-tracking branch 'origin/2018.1'

19 months ago- updating license files
Alexander Shatalin [Tue, 3 Apr 2018 14:34:43 +0000 (16:34 +0200)]
- updating license files
- updating copyright

19 months agoMerge remote-tracking branch 'origin/2018.1' into 181/simon
Semen Alperovich [Tue, 3 Apr 2018 14:12:13 +0000 (16:12 +0200)]
Merge remote-tracking branch 'origin/2018.1' into 181/simon

19 months agoRebuild run configurations without empty state
Artem Tikhomirov [Wed, 28 Mar 2018 14:59:26 +0000 (16:59 +0200)]
Rebuild run configurations without empty state

Consume recent change in j.m.exec.settings generator

19 months agoj.m.exec.settings: revert static state class, warn about unexpected consequences.
Artem Tikhomirov [Wed, 28 Mar 2018 15:30:08 +0000 (17:30 +0200)]
j.m.exec.settings: revert static state class, warn about unexpected consequences.

Aux methods in a run configurations are modeled with PersistentConfigurationMethod and generated as an instance Java method.
When such method is used for persistent property initialization, implicit this of run configuration is needed to invoke such methods.

19 months agoj.m.exec.settings: do not generate empty state in run configurations
Artem Tikhomirov [Wed, 28 Mar 2018 14:50:25 +0000 (16:50 +0200)]
j.m.exec.settings: do not generate empty state in run configurations

Empty MyState classes are of no use, just don't generate them.

19 months agomerge 2018.1 into master
Mihail Muhin [Fri, 30 Mar 2018 16:18:16 +0000 (19:18 +0300)]
merge 2018.1 into master

19 months agoMPS-27700 Move Property Up writes incorrect migration
Mihail Buryakov [Tue, 27 Mar 2018 12:27:43 +0000 (15:27 +0300)]
MPS-27700 Move Property Up writes incorrect migration

19 months agoMPS-27701  'Move concept' migrations are generated incorrectly
Mihail Buryakov [Sat, 24 Mar 2018 09:52:11 +0000 (12:52 +0300)]
MPS-27701  'Move concept' migrations are generated incorrectly

19 months agoMerge branch '2018.1'
Victor.Matchenko [Thu, 29 Mar 2018 17:20:59 +0000 (19:20 +0200)]
Merge branch '2018.1'

19 months agoDOC-5375 Fix contextual help link targets in help for MPS 2018.1
Victor.Matchenko [Thu, 29 Mar 2018 14:56:00 +0000 (16:56 +0200)]
DOC-5375 Fix contextual help link targets in help for MPS 2018.1

Required help topic ids were added.

19 months agoplatform 181.4203: update version to final IDEA 2018.1 Release
Victor.Matchenko [Thu, 29 Mar 2018 14:45:49 +0000 (16:45 +0200)]
platform 181.4203: update version to final IDEA 2018.1 Release

19 months agomerge 2018.1 into master
Mihail Muhin [Thu, 29 Mar 2018 17:16:24 +0000 (20:16 +0300)]
merge 2018.1 into master

19 months agoEnable transformation of an empty ExpressionStatement into a ReturnStatement by typin...
Vaclav [Thu, 29 Mar 2018 16:17:36 +0000 (18:17 +0200)]
Enable transformation of an empty ExpressionStatement into a ReturnStatement by typing "return"

19 months agomigration notifications: notifications implemented
Mihail Muhin [Wed, 28 Mar 2018 18:39:31 +0000 (21:39 +0300)]
migration notifications: notifications implemented

19 months agomigration notifications: simplify synchronization, extract myMigrationPostponed
Mihail Muhin [Wed, 28 Mar 2018 17:52:24 +0000 (20:52 +0300)]
migration notifications: simplify synchronization, extract myMigrationPostponed

19 months agomigration notifications: code readability in MigrationTrigger
Mihail Muhin [Wed, 28 Mar 2018 17:22:49 +0000 (20:22 +0300)]
migration notifications: code readability in MigrationTrigger

19 months agoworkaround for MPS-27711
Mihail Muhin [Wed, 28 Mar 2018 15:04:23 +0000 (18:04 +0300)]
workaround for MPS-27711

19 months agofix MPS-27439 console statement returning void leads to compilation errors when not...
Mihail Muhin [Tue, 27 Mar 2018 17:48:24 +0000 (20:48 +0300)]
fix MPS-27439 console statement returning void leads to compilation errors when not inside BLCommand

19 months agofix MPS-14474 return export annotations back: deprecated the annotations, prepared...
Mihail Muhin [Thu, 29 Mar 2018 15:58:21 +0000 (18:58 +0300)]
fix MPS-14474 return export annotations back: deprecated the annotations, prepared for removal

19 months agoMPS-27712 Can't add property antiquotation
Semen Alperovich [Thu, 29 Mar 2018 15:31:22 +0000 (17:31 +0200)]
MPS-27712 Can't add property antiquotation

Modify the test so there are no errors under the "before" and "under" sections.
Do so because antiquotation "antisuppress" the errors and the typesystem tests fails

19 months agoMPS-27722 Same macro is shown on the different references of the node
Semen Alperovich [Thu, 29 Mar 2018 13:23:41 +0000 (15:23 +0200)]
MPS-27722 Same macro is shown on the different references of the node
MPS-27712 Can't add property antiquotation

rebuild all editors

19 months agoUpdate node factories to copy nodes between GenerationContextOpBase sub-concept instances
Vaclav [Thu, 29 Mar 2018 13:09:49 +0000 (15:09 +0200)]
Update node factories to copy nodes between GenerationContextOpBase sub-concept instances

19 months agoMPS-27722 Same macro is shown on the different references of the node
Semen Alperovich [Thu, 29 Mar 2018 12:58:48 +0000 (14:58 +0200)]
MPS-27722 Same macro is shown on the different references of the node

19 months agoMPS-27712 Can't add property antiquotation
Semen Alperovich [Wed, 28 Mar 2018 22:38:35 +0000 (00:38 +0200)]
MPS-27712 Can't add property antiquotation

Introduce SPropertyInfo - information about the specific property edited by the cell
Set this information to the property cell
Use this information in the clients if the cell instead of the model accessor

19 months agoMPS-27712 Can't add property antiquotation
Semen Alperovich [Wed, 28 Mar 2018 22:25:55 +0000 (00:25 +0200)]
MPS-27712 Can't add property antiquotation

Create tests for antiquotations, property and reference macros, pattern property variable declaration

19 months agoMPS-27694 Improve show reflective editor experience
Semen Alperovich [Fri, 23 Mar 2018 15:42:32 +0000 (16:42 +0100)]
MPS-27694 Improve show reflective editor experience

19 months agoFix MPS-27717 Can't use Base Language enum in java classes in Idea with MPS facet
Daniil Elovkov [Thu, 29 Mar 2018 10:35:43 +0000 (13:35 +0300)]
Fix MPS-27717 Can't use Base Language enum in java classes in Idea with MPS facet

Also, regenerated BL code changed apparently to use a non-deprecated method

19 months agoupdate.xml for MPS 2018.1 RC2
Michael Vlassiev [Wed, 28 Mar 2018 21:35:37 +0000 (00:35 +0300)]
update.xml for MPS 2018.1 RC2