diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc23631..d6d49a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog
+## 2025.1.14
+ * Allows for multiple values to be passed in when an Enum has a `[Flags]` attribute
+
## 2025.1.13
* Update support for XML Only mods to allow launching directly through Rider
* Update support for XML Only mods to work with both 1.6 and 1.7
diff --git a/gradle.properties b/gradle.properties
index a6727e4..00f248f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@
DotnetPluginId=ReSharperPlugin.RimworldDev
DotnetSolution=ReSharperPlugin.RimworldDev.sln
RiderPluginId=com.jetbrains.rider.plugins.rimworlddev
-PluginVersion=2025.1.13
+PluginVersion=2025.1.14
BuildConfiguration=Release
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml
index 37b376c..bb1cfb0 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml
+++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml
@@ -58,8 +58,23 @@
1~two
0.5~high
left,2
+ North, South
(1,2,down)
+
+
+
+
+
+
+
+ Fresh, Invalid
+
+
+
+
+
+
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml.gold
index aee75f6..46f9998 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml.gold
+++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestInvalidValues.xml.gold
@@ -58,10 +58,25 @@
|1~two|(13)
|0.5~high|(14)
|left,2|(15)
+ |North, South|(16)
- |(1,2,down)|(16)
+ |(1,2,down)|(17)
+
+
+
+
+
+
+
+ Fresh, |Invalid|(18)
+
+
+
+
+
+
---------------------------------------------------------
@@ -81,4 +96,6 @@
(13): ReSharper Underlined Error Highlighting: "two" is not a valid integer
(14): ReSharper Underlined Error Highlighting: "high" is not a valid float
(15): ReSharper Underlined Error Highlighting: "left" is not a valid number
-(16): ReSharper Underlined Error Highlighting: "down" is not a valid number
+(16): ReSharper Underlined Error Highlighting: "North, South" is not a valid value for Rot4
+(17): ReSharper Underlined Error Highlighting: "down" is not a valid number
+(18): ReSharper Underlined Error Highlighting: "Invalid" is not a valid value for RotDrawMode
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml
index 6b7d5e3..2bda0fa 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml
+++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml
@@ -62,4 +62,18 @@
(0,0,0)
+
+
+
+
+
+
+
+ Fresh, Rotting
+
+
+
+
+
+
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml.gold b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml.gold
index f820948..834a540 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml.gold
+++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/test/data/Highlighting/TestValidValues.xml.gold
@@ -62,6 +62,20 @@
(0,0,0)
+
+
+
+
+
+
+
+ Fresh, Rotting
+
+
+
+
+
+
---------------------------------------------------------
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProblemAnalyzers/CustomXmlAnalysisStageProcess.cs b/src/dotnet/ReSharperPlugin.RimworldDev/ProblemAnalyzers/CustomXmlAnalysisStageProcess.cs
index dd4cd83..66a692c 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProblemAnalyzers/CustomXmlAnalysisStageProcess.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProblemAnalyzers/CustomXmlAnalysisStageProcess.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using JetBrains.Annotations;
@@ -270,11 +271,25 @@ private void ProcessVector3(string textValue, DocumentRange range)
private void ProcessEnum(string textValue, DocumentRange range, ITypeElement context)
{
if (context.GetType().Name != "Enum") return;
+
+ var isFlagAttribute = context.GetAttributeInstances(AttributesSource.Self)
+ .Any(attr => attr.GetClrName().FullName == "System.FlagsAttribute");
+
+ var textValues = isFlagAttribute ? textValue.Split(",").Select(item => item.Trim()) : [textValue];
var enumValues = context.GetMembers().Select(x => x.ShortName).ToList();
- if (!enumValues.Contains(textValue))
+ foreach (var value in textValues)
{
- AddError($"\"{textValue}\" is not a valid value for {context.ShortName}", range);
+ if (enumValues.Contains(value)) continue;
+
+ var valueIndex = textValue.IndexOf(value, StringComparison.Ordinal);
+
+ var targetedRange = new DocumentRange(
+ range.Document,
+ new TextRange(range.TextRange.StartOffset + valueIndex, range.TextRange.StartOffset + valueIndex + value.Length)
+ );
+
+ AddError($"\"{value}\" is not a valid value for {context.ShortName}", targetedRange);
}
}