Permalink
Commits on Aug 22, 2017
  1. Merge remote-tracking branch 'origin/2017.2'

    Radimir.Sorokin committed Aug 22, 2017
  2. MPS-26494 : migration script executes forever in case of cycle in re'…

    …export dependencies
    qradimir committed with Radimir.Sorokin Aug 21, 2017
  3. MPS-26449 Make shall not overwrite files if textgen produces same con…

    …tent
    
    Refactor FileProcessor, make it simple, provided we don't need anything but array of bytes
    atikhimirov committed Aug 11, 2017
  4. merge 2017.2 into master

    Mihail Muhin committed Aug 22, 2017
  5. resave module descriptors, make (fixes tests)

    Mihail Muhin committed Aug 22, 2017
  6. changes after Simon's review:

    filterPresentLanguageVersions->filterValidLanguageVersions,
    collectPresentLanguageVersions->collectActualLanguageVersions,
    filterPresentModuleVersions->filterValidDependencyVersions,
    collectPresentModuleVersions->collectActualDependencyVersions,
    getAllConceptMethods->getVisibleConceptMethods,
    remove odd resolve() in VersionFixer,
    KeyMapKeystroke_Behavior.getKeyStroke(): fix modifiers string even if there’s no keycode (shouldn’t play a big role as it's an "incorrect" case, but still)
    Mihail Muhin committed Aug 21, 2017
Commits on Aug 21, 2017
  1. merge 2017.2 into master

    Mihail Muhin committed Aug 21, 2017
  2. fix MPS-26477 "not migrated libs" error in migration wizard on fresh …

    …project
    Mihail Muhin committed Aug 17, 2017
  3. fix MPS-25295 Some actions could be probably removed from NonDumbAwar…

    …eActions, since they do not seem to be using indices
    Mihail Muhin committed Aug 10, 2017
  4. fix MPS-26101 Do not delete info about not deployed languages in modu…

    …le descriptors
    Mihail Muhin committed Aug 10, 2017
Commits on Aug 20, 2017
  1. Merge branch origin/2017.2

    alperovich committed Aug 20, 2017
  2. MPS-26467  Argument for @NotNull parameter 'node' of jetbrains/mps/op…

    …enapi/navigation/EditorNavigator.open must not be null
    alperovich committed Aug 20, 2017
  3. MPS-25941 User's action doUpdate method failed. Action: Move Elements…

    … Up. Class: jetbrains.mps.ide.editor.actions.MoveElementsUp_Action
    alperovich committed with alperovich Aug 14, 2017
Commits on Aug 18, 2017
Commits on Aug 17, 2017
  1. MPS-26069 null

    ashatalin committed Aug 14, 2017
  2. MPS-26434 run in EDT failure: com.intellij.openapi.fileEditor.FileEdi…

    …torState$$Lambda$556/1828770593 cannot be cast to jetbrains.mps.ide.editor.MPSEditorStateWrapper
    ashatalin committed Aug 11, 2017
  3. MPS-26429 Exception triggered in projects that add a preferences comp…

    …onent when trying to open the Preferences window
    
    Quick fix for now - add required id and instanceClass fields to preference page in constructor.
    Language will be updated alongside with MPS-21020 and MPS-21024 in 2017.3
    Victor.Matchenko committed Aug 16, 2017
  4. MPS-26462 Help links are updated on non existing in bugfix releases

    Have to add check of minor version, if it contains bugfix (micro) version, because in IdeaApplicationInfo.xml minor="2.1" instead of minor="2" micro="1" (fix for MPS-26046)
    Victor.Matchenko committed Aug 15, 2017
  5. MPS-26450 update version to 2017.2.1

    Update minor version in forgotten IdeaApplicationInfo.xml
    Victor.Matchenko committed Aug 15, 2017
  6. MPS-22398 Useless selections in concept declaration and inspector on …

    …actions go to declaration/go to concept declaration
    
    Change flag 'select' to false in method call jetbrains.mps.openapi.navigation.NavigationSupport#openNode. Now concept code and editor are not selected after action execution.
    For GoToConceptDeclaration_Action also prevent NPE in case of reference to concept or its resolver are broken.
    Victor.Matchenko committed Aug 1, 2017
Commits on Aug 15, 2017
  1. MPS-26199 Git: unversioned models should be highlighted by red colour…

    … in project view
    
    In method jetbrains.mps.ide.ui.tree.MPSTreeNode#updatePresentation(), if myTreeMessages != null, then from jetbrains.mps.ide.ui.tree.TreeMessage#getColor color for text is taken, which corresponds to one of the colors from com.intellij.openapi.vcs.FileStatus
    This messages are set in method jetbrains.mps.vcs.changesmanager.tree.TreeHighlighter#rehighlightNode, which will be called, if in registration process for jetbrains.mps.ide.ui.tree.MPSTreeNode in method jetbrains.mps.vcs.changesmanager.tree.TreeHighlighter#registerNode there is jetbrains.mps.vcs.changesmanager.tree.features.Feature for this node.
    And this was not true for Module (always was this way) and Model TreeNode.
    
    For Models it was broken in commit ad50c6c:
    SModelTreeNode does not implement MPSTreeNodeEx, as does not its getParent(), this means that node and nodePointer will be equals to null.
    In that commit check was added, that nodePointer == null in which case null returned from method.
    So code 'if (treeNode instanceof SModelTreeNode)' is unreachable, because its nodePointer is always == null.
    Victor.Matchenko committed Jul 28, 2017
  2. MPS-26275 Add shortcut to open migration group in Main menu

    Add shortcuts to main Migration group and all sub-groups and some top level actions.
    Victor.Matchenko committed Jul 27, 2017
Commits on Aug 14, 2017
  1. Merge remote-tracking branch 'remotes/origin/2017.2'

    Victor.Matchenko committed Aug 14, 2017
  2. platform 172.3544: MPS-26456, update version in properties file

    Victor.Matchenko committed Aug 14, 2017
Commits on Aug 12, 2017
  1. merge 2017.2 into master

    Mihail Buryakov committed Aug 12, 2017