natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update coderules plugin desc, fix release number

This commit is contained in:
Fedor Isakov 2021-04-19 22:47:45 +02:00
parent 98fef4c95d
commit c44e4b2080
5 changed files with 3996 additions and 948 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -145,7 +145,7 @@ ant.importBuild('build.xml') { antTarget ->
}
ant.properties.'ci.build.num' = "${buildNumber().find() ? buildNumber()[0][4] : '9999'}".toString()
ant.properties.'ci.build.tag' = "${buildNumber().find() ? buildNumber()[0][4] : 'SNAPSHOT'}".toString()
ant.properties.'ci.mps.release' = "${buildNumber().find() ? buildNumber()[0][1] : '212'}".toString()
ant.properties.'ci.mps.release' = "${buildNumber().find() ? buildNumber()[0][1] : '213'}".toString()
ant.properties.'mps.ant.log' = "debug"
// ensure 'setup' runs before 'fetchDependencies' and 'declare-mps-tasks'

4910
build.xml
View File

File diff suppressed because it is too large Load Diff

17
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -22,11 +22,15 @@
<concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
<property id="6666499814681415862" name="tagName" index="2pNNFO" />
<child id="6666499814681415861" name="attributes" index="2pNNFR" />
<child id="1622293396948928802" name="content" index="3o6s8t" />
</concept>
<concept id="6666499814681447923" name="jetbrains.mps.core.xml.structure.XmlAttribute" flags="ng" index="2pNUuL">
<property id="6666499814681447926" name="attrName" index="2pNUuO" />
<child id="6666499814681541918" name="value" index="2pMdts" />
</concept>
<concept id="1622293396948952339" name="jetbrains.mps.core.xml.structure.XmlText" flags="nn" index="3o6iSG">
<property id="1622293396948953704" name="value" index="3o6i5n" />
</concept>
</language>
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
<concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModuleGroup" flags="ng" index="22LTRF">
@ -287,10 +291,19 @@
<node concept="2pNUuL" id="5Hdh9$IhmW_" role="2pNNFR">
<property role="2pNUuO" value="since-build" />
<node concept="2pMdtt" id="5Hdh9$IhnkA" role="2pMdts">
<property role="2pMdty" value="212.1" />
<property role="2pMdty" value="213.1" />
</node>
</node>
</node>
<node concept="2pNNFK" id="2fVm_54SZ$e" role="20twgj">
<property role="2pNNFO" value="change-notes" />
<node concept="3o6iSG" id="2fVm_54SZHp" role="3o6s8t">
<property role="3o6i5n" value="First public EAP" />
</node>
</node>
<node concept="2pNNFK" id="2fVm_54SZBF" role="20twgj">
<property role="2pNNFO" value="depends" />
</node>
<node concept="m$_yB" id="2ABzB2CYN_W" role="m$_yh">
<ref role="m$_yA" node="7BVjoXzUxkQ" resolve="jetbrains.mps.logic" />
</node>
@ -3500,7 +3513,7 @@
<node concept="aVJcg" id="5Hdh9$IhmQ_" role="aVJcv">
<node concept="NbPM2" id="5Hdh9$IhmQA" role="aVJcq">
<node concept="3Mxwew" id="5Hdh9$IhmQB" role="3MwsjC">
<property role="3MwjfP" value="212" />
<property role="3MwjfP" value="213" />
</node>
</node>
</node>

11
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/EvaluationSessionImpl.kt
View File

@ -171,19 +171,23 @@ internal class EvaluationSessionImpl private constructor (
@Suppress("UNCHECKED_CAST")
val durations = parameters[ParameterKey.of("profiling.data", MutableMap::class.java)]
as MutableMap<String, String>?
val profiler = durations?.let { Profiler() }
val profiler = durations?.let { (token as? SessionTokenImpl)?.profiler ?: Profiler() }
session = EvaluationSessionImpl(ispec, program, supervisor, evaluationTrace, profiler, parameters)
Backend.ourBackend.ourSession.set(session)
try {
val main = parameters[ParameterKey.of("main", Constraint::class.java)] as Constraint
return session.launch(token, main)
val result = session.launch(token, main)
if (profiler != null) {
((result as EvaluationResultImpl).token as SessionTokenImpl).profiler = profiler
}
return result
}
finally {
try {
profiler?.run {
formattedData().entries.forEach { e -> durations.put(e.key, e.value) }
clear()
// clear()
}
}
catch (t: Throwable) {
@ -191,7 +195,6 @@ internal class EvaluationSessionImpl private constructor (
}
Backend.ourBackend.ourSession.set(null)
}
}
}

4
reactor/Core/src/jetbrains/mps/logic/reactor/core/internal/SessionTokenImpl.kt
View File

@ -22,6 +22,7 @@ import jetbrains.mps.logic.reactor.core.RuleIndex
import jetbrains.mps.logic.reactor.evaluation.MatchJournalView
import jetbrains.mps.logic.reactor.evaluation.SessionToken
import jetbrains.mps.logic.reactor.program.Rule
import jetbrains.mps.logic.reactor.util.Profiler
data class SessionTokenImpl(
private val journalView: MatchJournal.View,
@ -29,7 +30,8 @@ data class SessionTokenImpl(
private val frontState: DispatchingFrontState,
val ruleIndex: RuleIndex,
val logicalState: LogicalState,
val principalObservers: PrincipalObserverDispatcher = PrincipalObserverDispatcher.EMPTY
val principalObservers: PrincipalObserverDispatcher = PrincipalObserverDispatcher.EMPTY,
var profiler: Profiler? = null
) : SessionToken
{
override fun getJournalView(): MatchJournalView = journalView