Merge pull request #30 from penev92/fixSpriteImages

Fixed incorrect detection of sprite sequence image
penev92 · Oct 23, 2022 · 4862bad · 4862bad
2 parents b58215e + 4234a03
commit 4862bad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...nguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentCompletionHandler.cs b/...nguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentCompletionHandler.cs
@@ -303,7 +303,7 @@ protected override IEnumerable<CompletionItem> HandleRulesValue(CursorTarget cur
 					// NOTE: This will improve if/when we add the attribute.
 					if (traitInfo.TraitPropertyInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
 						    && y.Value != null
-						    && y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
+						    && (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))))
 					{
 						return spriteSequenceImageNames;
 					}
@@ -442,7 +442,7 @@ protected override IEnumerable<CompletionItem> HandleWeaponValue(CursorTarget cu
 					// Pretend there is such a thing as a "SequenceImageReferenceAttribute" until we add it in OpenRA one day.
 					// NOTE: This will improve if/when we add the attribute.
 					if (fieldInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
-					        && y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
+					        && (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))))
 					{
 						return spriteSequenceImageNames;
 					}

diff --git a/...nguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentDefinitionHandler.cs b/...nguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentDefinitionHandler.cs
@@ -187,7 +187,7 @@ protected override IEnumerable<Location> HandleRulesValue(CursorTarget cursorTar
 							// Pretend there is such a thing as a "SequenceImageReferenceAttribute" until we add it in OpenRA one day.
 							// NOTE: This will improve if/when we add the attribute.
 							if (traitInfo.TraitPropertyInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
-								    && y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
+								    && (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))))
 							{
 								return spriteSequenceImageDefinitions[cursorTarget.TargetString].Select(x => x.Location.ToLspLocation(x.Name.Length));
 							}
@@ -360,7 +360,7 @@ protected override IEnumerable<Location> HandleWeaponValue(CursorTarget cursorTa
 					// Pretend there is such a thing as a "SequenceImageReferenceAttribute" until we add it in OpenRA one day.
 					// NOTE: This will improve if/when we add the attribute.
 					if (fieldInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
-					        && y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
+					        && (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))))
 					{
 						return spriteSequenceImageDefinitions[cursorTarget.TargetString].Select(x => x.Location.ToLspLocation(x.Name.Length));
 					}

diff --git a/...de.LanguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentHoverHandler.cs b/...de.LanguageServer/LanguageServerProtocolHandlers/TextDocument/TextDocumentHoverHandler.cs
@@ -236,7 +236,7 @@ protected override Hover HandleRulesValue(CursorTarget cursorTarget)
 							// Pretend there is such a thing as a "SequenceImageReferenceAttribute" until we add it in OpenRA one day.
 							// NOTE: This will improve if/when we add the attribute.
 							if (traitInfo.TraitPropertyInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
-								    && y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))
+								    && (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
 							    && spriteSequenceImageDefinitions.Contains(cursorTarget.TargetString))
 							{
 								var image = spriteSequenceImageDefinitions[cursorTarget.TargetString].First();
@@ -482,7 +482,7 @@ protected override Hover HandleWeaponValue(CursorTarget cursorTarget)
 					// Pretend there is such a thing as a "SequenceImageReferenceAttribute" until we add it in OpenRA one day.
 					// NOTE: This will improve if/when we add the attribute.
 					if (fieldInfos.Any(x => x.OtherAttributes.Any(y => y.Name == "SequenceReference"
-							&& y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name))
+							&& (y.Value.Contains(',') ? y.Value.Substring(0, y.Value.IndexOf(',')) == fieldInfo.Name : y.Value == fieldInfo.Name)))
 					    && spriteSequenceImageDefinitions.Contains(cursorTarget.TargetString))
 					{
 						var image = spriteSequenceImageDefinitions[cursorTarget.TargetString].First();