From cdac933b0c27c2a67a218fbeffa90bd146cb7668 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Thu, 5 Sep 2019 22:09:16 +0200 Subject: [PATCH] Refactor TraceObject to contain all traces from all evaluation sesssion. If multiple aspect cliques are used in a model, multiple sessions are launched, which results in multiple traces. --- .../models/plugin.mps | 521 +++++++++--------- .../models/service.mps | 97 ++-- 2 files changed, 335 insertions(+), 283 deletions(-) diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps index 04809c87..f2d2e6e0 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps @@ -605,6 +605,7 @@ + @@ -27491,22 +27492,6 @@ - - - - - - - - - - - - - - - - @@ -27535,295 +27520,327 @@ - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - + + + - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - + + + + + + - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + - diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps index d01a8fb6..2c8109c6 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps @@ -398,6 +398,7 @@ + @@ -6853,15 +6854,17 @@ - - + + - - + + + + @@ -6870,8 +6873,10 @@ - - + + + + @@ -6889,23 +6894,25 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -6922,8 +6929,10 @@ - - + + + + @@ -6955,8 +6964,11 @@ - - + + + + + @@ -6971,8 +6983,11 @@ - - + + + + + @@ -6983,11 +6998,11 @@ - - - + + + @@ -7004,16 +7019,36 @@ - - + + + + + + + + + + + - - + + + + + + + + + + + + +