Structured Programming #84
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_TYPE for every node, region and Transition in SCChart synthesis based on changes from tik/proxy-view. There is no merge since all the changes where kind of spread out and it was only a minor portion of the commits i needed.
…and more action suport
# Conflicts: # plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/ControlflowRegionSynthesis.xtend # plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/DataflowRegionSynthesis.xtend # plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/StateSynthesis.xtend
…s the Information to the Tags
soerendomroes
requested changes
Apr 4, 2023
There was a problem hiding this comment.
This should not be empty. I guess this is in here because you want to use a service interface?
| @@ -24,6 +24,7 @@ import org.eclipse.xtext.Constants | |||
| import org.eclipse.xtext.IGrammarAccess | |||
| import org.eclipse.xtext.ide.server.ILanguageServerExtension | |||
| import org.eclipse.xtext.util.Modules2 | |||
| import de.cau.cs.kieler.klighd.lsp.structuredProgramming.sccharts.StructuredProgScchartLanguageServerExtension | |||
There was a problem hiding this comment.
Refactoring this to be in the semantic would allow to collect the LS extension via a service interface as done in line 63.
| @@ -41,7 +41,8 @@ Require-Bundle: de.cau.cs.kieler.klighd, | |||
| org.eclipse.jdt.core;bundle-version="3.19.0", | |||
| de.cau.cs.kieler.kicool.ide, | |||
| de.cau.cs.kieler.annotations.ide, | |||
| org.eclipse.elk.core.service | |||
| org.eclipse.elk.core.service, | |||
| de.cau.cs.kieler.klighd.lsp;bundle-version="2.2.1" | |||
There was a problem hiding this comment.
I think this dependency should not be necessary.
Maybe all the SCCharts structured editing should be in a new package in scharts.ide?
Are the changes in sccharts.ui from your work or from the work on the proxies?
| /** | ||
| * Enables the structured programming mode on the client | ||
| */ | ||
| public static final SynthesisOption ENABLE_STRUCTURED_PROGRAMMING = SynthesisOption.createCheckOption( |
There was a problem hiding this comment.
I guess this is the only real change, the other ones are whitespace changes?
| @@ -187,7 +198,12 @@ class SCChartsSynthesis extends AbstractDiagramSynthesis<SCCharts> { | |||
| if (scc.hasPragma(PRAGMA_SKINPATH)) { | |||
| setSkinPath(scc.getStringPragmas(PRAGMA_SKINPATH).head.values.head, usedContext) | |||
| } | |||
|
|
|||
|
|
|||
| //Enables or disables the display of the contextmenu on the client. | |||
| @@ -326,8 +367,12 @@ class StateSynthesis extends SubSynthesis<State, KNode> { | |||
| if (SHOW_INHERITANCE.booleanValue) regions.addAll(0, state.allVisibleInheritedRegions.toList) | |||
| for (region : regions) { | |||
| switch region { | |||
| ControlflowRegion: node.children += region.transform | |||
| DataflowRegion: node.children += region.transform | |||
| ControlflowRegion: { | |||
| * | ||
| * http://rtsys.informatik.uni-kiel.de/kieler | ||
| * | ||
| * Copyright ${year} by |
11 tasks
|
Superseded by #107 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@soerendomroes