Show "Channels:" header when channels are defined

Signed-off-by: Laurent Garnier <[email protected]>
openhab · Jan 30, 2025 · 506527b · 506527b
1 parent 81a2305
commit 506527b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext b/bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/Thing.xtext
@@ -26,9 +26,9 @@ ModelBridge returns ModelThing:
 		properties+=ModelProperty? (',' properties+=ModelProperty)*
 	']')?
 	('{'
-		('Things:')?
+		(thingsHeader?='Things:')?
 		things+=(ModelThing|ModelBridge)*
-		('Channels:')?			
+		(channelsHeader?='Channels:')?
 		channels+=ModelChannel*   
 
 	'}')?
@@ -43,7 +43,7 @@ ModelThing:
 		properties+=ModelProperty? (',' properties+=ModelProperty)*
 	']')?
 	('{'
-		('Channels:')?
+		(channelsHeader?='Channels:')?
 		channels+=ModelChannel*
 	'}')?
 ;

diff --git a/...openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend b/...openhab.core.model.thing/src/org/openhab/core/model/thing/formatting/ThingFormatter.xtend
@@ -33,12 +33,14 @@ class ThingFormatter extends AbstractDeclarativeFormatter {
 	@Inject extension ThingGrammarAccess
 
 	override protected void configureFormatting(FormattingConfig c) {
-		c.setLinewrap(1, 1, 2).before("Bridge")
+		c.setLinewrap(1, 1, 2).before("Bridge", "Things:", "Channels:")
 		c.setLinewrap(1, 1, 2).before(modelThingRule)
 		c.setLinewrap(1, 1, 2).before(modelChannelRule)
 
 		c.setIndentationIncrement.after("{")
 		c.setIndentationDecrement.before("}")
+		c.setIndentationIncrement.before(modelChannelRule)
+		c.setIndentationDecrement.after(modelChannelRule)
 		c.setLinewrap().before("}")
 
 		c.setNoSpace().withinKeywordPairs("(", ")")

diff --git a/...ng/src/org/openhab/core/model/thing/internal/syntaxgenerator/ThingDslSyntaxGenerator.java b/...ng/src/org/openhab/core/model/thing/internal/syntaxgenerator/ThingDslSyntaxGenerator.java
@@ -120,14 +120,17 @@ private ModelThing buildModelThing(Thing thing, boolean preferPresentationAsTree
         }
 
         if (preferPresentationAsTree && modelBridge != null) {
+            modelBridge.setThingsHeader(false);
             for (Thing child : getChildThings(thing)) {
                 if (onlyThings.contains(child) && !handledThings.contains(child)) {
                     modelBridge.getThings().add(buildModelThing(child, true, false, onlyThings, handledThings));
                 }
             }
         }
 
-        for (Channel channel : getNonDefaultChannels(thing)) {
+        List<Channel> channels = getNonDefaultChannels(thing);
+        model.setChannelsHeader(!channels.isEmpty());
+        for (Channel channel : channels) {
             model.getChannels().add(buildModelChannel(channel));
         }