Skip to content
Browse files

Fixed MPS-9643 Editor with images throws exception on VCS merge

Fixed MPS-10258 [build:15.6422] Failed to create cell for node [leftExpression] HashExpression <no name>[1240850659107] in jetbrains.charisma.user.profile
  • Loading branch information...
1 parent dea56a0 commit c48abdd6fcb962a058b36949944f9f9248d3243f Evgeny Gerashchenko committed
View
10 core/languageDesign/editor/source/jetbrains/mps/nodeEditor/cells/EditorCell_Image.java
@@ -138,15 +138,17 @@ private static String expandIconPath(String path, SNode sourceNode) {
}
private static IModule findAnchorModule(SModel sourceModel) {
- IModule module;
+ IModule module = null;
SModelDescriptor modelDescriptor = sourceModel.getModelDescriptor();
Language modelLang = Language.getLanguageFor(modelDescriptor);
if (modelLang != null) {
module = modelLang;
} else {
- module = modelDescriptor.getModule();
- if (!(module instanceof Solution)) {
- module = null;
+ if (modelDescriptor != null) {
+ module = modelDescriptor.getModule();
+ if (!(module instanceof Solution)) {
+ module = null;
+ }
}
}
return module;

0 comments on commit c48abdd

Please sign in to comment.
Something went wrong with that request. Please try again.