[SimVarItem] Allow colon (:) in L var names (fixes #57); Validate tha…

…t a unit type is specified for variable types which require them.
mpaperno · Aug 4, 2023 · e98a251 · e98a251
1 parent 5b8c4ad
commit e98a251
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/MSFSTouchPortalPlugin/Types/SimVarItem.cs b/MSFSTouchPortalPlugin/Types/SimVarItem.cs
@@ -428,6 +428,8 @@ static bool returnError(string err, ref string outerr) {
         return returnError("Name is empty", ref resultMsg);
       if (string.IsNullOrEmpty(SimVarName))
         return returnError("Variable Name is empty", ref resultMsg);
+      if (RequiresUnitType(VariableType) && string.IsNullOrEmpty(Unit))
+        return returnError("Unit type is empty and required", ref resultMsg);
 
       // Make sure a category is assigned, except for temporary items
       if (CategoryId == Groups.None && DefinitionSource != SimVarDefinitionSource.Temporary)
@@ -466,8 +468,8 @@ static bool returnError(string err, ref string outerr) {
 
         case 'L':
         case 'T':
-          // Local and Token variable types may only have alphanumerics and underscores, no spaces.
-          if (!Regex.IsMatch(SimVarName, @"^[a-zA-Z][a-zA-Z0-9_]+$", RegexOptions.Compiled | RegexOptions.CultureInvariant))
+          // Local and Token variable types may only have alphanumerics, underscores, and colons; no spaces.
+          if (!Regex.IsMatch(SimVarName, @"^[a-zA-Z][a-zA-Z0-9_:]+$", RegexOptions.Compiled | RegexOptions.CultureInvariant))
             return returnError($"Variable Name '{SimVarName}' contains invalid character(s)", ref resultMsg);
           break;