epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to Linguini

Browse Source
This commit is contained in:
Matthias Mailänder
2022-04-22 22:12:13 +02:00
committed by Paul Chote
parent 9d8c2bb4c4
commit 834de4efbe
11 changed files with 206 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
OpenRA.Mods.Common/Lint/CheckTranslationReference.cs
View File

@@ -14,8 +14,8 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using Fluent.Net;
using Fluent.Net.RuntimeAst;
using Linguini.Syntax.Ast;
using Linguini.Syntax.Parser;
namespace OpenRA.Mods.Common.Lint
{
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Lint
emitError($"Translation attribute on non string field {fieldInfo.Name}.");
var key = (string)fieldInfo.GetValue(string.Empty);
if (!translation.HasAttribute(key))
if (!translation.HasMessage(key))
emitError($"{key} not present in {language} translation.");
var translationReference = fieldInfo.GetCustomAttributes<TranslationReferenceAttribute>(true)[0];
@@ -56,43 +56,57 @@ namespace OpenRA.Mods.Common.Lint
var stream = modData.DefaultFileSystem.Open(file);
using (var reader = new StreamReader(stream))
{
var runtimeParser = new RuntimeParser();
var result = runtimeParser.GetResource(reader);
var parser = new LinguiniParser(reader);
var result = parser.Parse();
foreach (var entry in result.Entries)
{
if (!referencedKeys.Contains(entry.Key))
emitWarning($"Unused key `{entry.Key}` in {file}.");
if (!referencedKeys.Contains(entry.GetId()))
emitWarning($"Unused key `{entry.GetId()}` in {file}.");
var message = entry.Value;
var node = message.Value;
variableReferences.Clear();
if (node is Pattern pattern)
if (entry is AstMessage message)
{
foreach (var element in pattern.Elements)
var node = message.Value;
foreach (var element in node.Elements)
{
if (element is SelectExpression selectExpression)
if (element is Placeable placeable)
{
foreach (var variant in selectExpression.Variants)
var expression = placeable.Expression;
if (expression is IInlineExpression inlineExpression)
{
if (variant.Value is Pattern variantPattern)
if (inlineExpression is VariableReference variableReference)
CheckVariableReference(variableReference.Id.Name.ToString(), entry, emitWarning, file);
}
if (expression is SelectExpression selectExpression)
{
foreach (var variant in selectExpression.Variants)
{
foreach (var variantElement in variantPattern.Elements)
CheckVariableReference(variantElement, entry, emitWarning, file);
foreach (var variantElement in variant.Value.Elements)
{
if (variantElement is Placeable variantPlaceable)
{
var variantExpression = variantPlaceable.Expression;
if (variantExpression is IInlineExpression variantInlineExpression)
{
if (variantInlineExpression is VariableReference variantVariableReference)
CheckVariableReference(variantVariableReference.Id.Name.ToString(), entry, emitWarning, file);
}
}
}
}
}
}
CheckVariableReference(element, entry, emitWarning, file);
}
if (referencedVariablesPerKey.ContainsKey(entry.Key))
if (referencedVariablesPerKey.ContainsKey(entry.GetId()))
{
var referencedVariables = referencedVariablesPerKey[entry.Key];
var referencedVariables = referencedVariablesPerKey[entry.GetId()];
foreach (var referencedVariable in referencedVariables)
{
if (!variableReferences.Contains(referencedVariable))
emitError($"Missing variable `{referencedVariable}` for key `{entry.Key}` in {file}.");
emitError($"Missing variable `{referencedVariable}` for key `{entry.GetId()}` in {file}.");
}
}
}
@@ -101,21 +115,18 @@ namespace OpenRA.Mods.Common.Lint
}
}
void CheckVariableReference(Node element, KeyValuePair<string, Message> entry, Action<string> emitWarning, string file)
void CheckVariableReference(string element, IEntry entry, Action<string> emitWarning, string file)
{
if (element is VariableReference variableReference)
{
variableReferences.Add(variableReference.Name);
variableReferences.Add(element);
if (referencedVariablesPerKey.ContainsKey(entry.Key))
{
var referencedVariables = referencedVariablesPerKey[entry.Key];
if (!referencedVariables.Contains(variableReference.Name))
emitWarning($"Unused variable `{variableReference.Name}` for key `{entry.Key}` in {file}.");
}
else
emitWarning($"Unused variable `{variableReference.Name}` for key `{entry.Key}` in {file}.");
if (referencedVariablesPerKey.ContainsKey(entry.GetId()))
{
var referencedVariables = referencedVariablesPerKey[entry.GetId()];
if (!referencedVariables.Contains(element))
emitWarning($"Unused variable `{element}` for key `{entry.GetId()}` in {file}.");
}
else
emitWarning($"Unused variable `{element}` for key `{entry.GetId()}` in {file}.");
}
}
}

21
OpenRA.Mods.Common/Lint/CheckTranslationSyntax.cs
View File

@@ -12,8 +12,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using Fluent.Net;
using Fluent.Net.Ast;
using Linguini.Syntax.Ast;
using Linguini.Syntax.Parser;
namespace OpenRA.Mods.Common.Lint
{
@@ -27,20 +27,19 @@ namespace OpenRA.Mods.Common.Lint
using (var reader = new StreamReader(stream))
{
var ids = new List<string>();
var parser = new Parser();
var resource = parser.Parse(reader);
foreach (var entry in resource.Body)
var parser = new LinguiniParser(reader);
var resource = parser.Parse();
foreach (var entry in resource.Entries)
{
if (entry is Junk junk)
foreach (var annotation in junk.Annotations)
emitError($"{annotation.Code}: {annotation.Message} in {file} line {annotation.Span.Start.Line}");
emitError($"{junk.GetId()}: {junk.AsStr()} in {file} {junk.Content}");
if (entry is MessageTermBase message)
if (entry is AstMessage message)
{
if (ids.Contains(message.Id.Name))
emitWarning($"Duplicate ID `{message.Id.Name}` in {file} line {message.Span.Start.Line}");
if (ids.Contains(message.Id.Name.ToString()))
emitWarning($"Duplicate ID `{message.Id.Name}` in {file}.");
ids.Add(message.Id.Name);
ids.Add(message.Id.Name.ToString());
}
}
}

2
OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
widget.Get<LabelWidget>("CONNECTING_DESC").GetText = () => $"Could not connect to {connection.Target}";
var connectionError = widget.Get<LabelWidget>("CONNECTION_ERROR");
connectionError.GetText = () => modData.Translation.GetFormattedMessage(orderManager.ServerError) ?? connection.ErrorMessage ?? "Unknown error";
connectionError.GetText = () => modData.Translation.GetString(orderManager.ServerError) ?? connection.ErrorMessage ?? "Unknown error";
var panelTitle = widget.Get<LabelWidget>("TITLE");
panelTitle.GetText = () => orderManager.AuthenticationFailed ? "Password Required" : "Connection Failed";