DSL Items Parser: Fix incorrect parsing of tags as start of item definition

When specifying tag names that match one of the valid item types, e.g. `Switch`, the parser incorrectly treated it as a new start of an item definition.

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>

Author: jimtng

bundles/org.openhab.core.model.item/src/org/openhab/core/model/Items.xtext

@@ -17,9 +17,9 @@ ModelItem:
 	(ModelNormalItem | ModelGroupItem) name=ID
 	(label=STRING)?
 	('<' icon=Icon '>')?
-	('(' groups+=ID (',' groups+=ID)* ')')? 
-	('[' tags+=(ID|STRING) (',' tags+=(ID|STRING))* ']')?
-	('{' bindings+=ModelBinding (',' bindings+=ModelBinding)* '}')? 
+	('(' groups+=ID (',' groups+=ID)* ')')?
+	('[' tags+=TagValue (',' tags+=TagValue)* ']')?
+	('{' bindings+=ModelBinding (',' bindings+=ModelBinding)* '}')?
 ;
 
 ModelGroupItem:
@@ -56,7 +56,7 @@ ValueType returns ecore::EJavaObject:
     STRING | NUMBER | BOOLEAN
 ;
 
-BOOLEAN returns ecore::EBoolean: 
+BOOLEAN returns ecore::EBoolean:
     'true' | 'false'
 ;
 
@@ -68,6 +68,12 @@ Icon:
 	(ID ':' (ID ':')?)? ID
 ;
 
+// Add BaseModelItemType here as valid tags
+// otherwise the parser thinks it's the start of an Item definition
+TagValue:
+    ID | STRING | BaseModelItemType
+;
+
 terminal ID: '^'?('a'..'z'|'A'..'Z'|'_'|'0'..'9') ('a'..'z'|'A'..'Z'|'_'|'-'|'0'..'9')*;
 
 terminal STRING: