mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 22:55:08 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## Checklist - [ ] I have signed the [CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf) and read the [CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md) doc. - [ ] I have added tests that prove my fix is effective or that my feature works and increased code coverage. - [x] I have added all necessary documentation. - [x] I have verified that my changes do not introduce (new) build or analyzer warnings. - [ ] I ran **all** tests locally using the **UA.slnx** solution against at least .net **framework** and .net **10**, and all passed. - [ ] I fixed **all** failing and flaky tests in the CI pipelines and **all** CodeQL warnings. - [ ] I have addressed **all** PR feedback received. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
324 lines
9.9 KiB
C#
324 lines
9.9 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Globalization;
|
|
using System.Linq;
|
|
using System.Runtime.CompilerServices;
|
|
|
|
namespace Opc.Ua.SourceGeneration
|
|
{
|
|
/// <summary>
|
|
/// Template string
|
|
/// </summary>
|
|
internal sealed class TemplateString
|
|
{
|
|
/// <summary>
|
|
/// Empty string
|
|
/// </summary>
|
|
public static readonly TemplateString Empty = string.Empty;
|
|
|
|
/// <summary>
|
|
/// Parsed formattable string
|
|
/// </summary>
|
|
public ParsedTemplateString ParsedTemplate { get; }
|
|
|
|
/// <summary>
|
|
/// Private constructor
|
|
/// </summary>
|
|
private TemplateString(ParsedTemplateString parsedTemplate)
|
|
{
|
|
ParsedTemplate = parsedTemplate;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create from string
|
|
/// </summary>
|
|
/// <param name="value"></param>
|
|
/// <returns></returns>
|
|
public static implicit operator TemplateString(string value)
|
|
{
|
|
return new TemplateString(
|
|
ParsedTemplateString.FromString(value ?? string.Empty));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create from interpolated string parser
|
|
/// </summary>
|
|
/// <param name="parser"></param>
|
|
/// <returns></returns>
|
|
public static TemplateString Parse(TemplateParser parser)
|
|
{
|
|
return new TemplateString(parser.Parsed);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Parse template using compiler
|
|
/// </summary>
|
|
[InterpolatedStringHandler]
|
|
internal readonly struct TemplateParser
|
|
{
|
|
/// <inheritdoc/>
|
|
public TemplateParser(int literalLength, int formattedCount)
|
|
{
|
|
Parsed = new ParsedTemplateString(literalLength, formattedCount);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ParsedTemplateString Parsed { get; }
|
|
|
|
/// <inheritdoc/>
|
|
public readonly void AppendLiteral(string s)
|
|
{
|
|
Parsed.AddLiteral(s);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public readonly void AppendFormatted<T>(T t)
|
|
{
|
|
Parsed.AddFormatted(
|
|
(t is IFormattable f ?
|
|
f.ToString(null, CultureInfo.InvariantCulture) : t!.ToString())!, typeof(T));
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public string GetFormattedText()
|
|
{
|
|
return Parsed.ToString(CultureInfo.InvariantCulture); // Return string.empty
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// A parsed template string
|
|
/// </summary>
|
|
internal class ParsedTemplateString : FormattableString
|
|
{
|
|
public const int MaxLiteralLength = 1 * 1024 * 1024;
|
|
public const int MaxFormattedCount = 16 * 1024;
|
|
|
|
/// <summary>
|
|
/// Created parsed template
|
|
/// </summary>
|
|
public ParsedTemplateString(int literalLength, int formattedCount)
|
|
{
|
|
if (literalLength is > MaxLiteralLength or < 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(literalLength));
|
|
}
|
|
if (formattedCount is > MaxFormattedCount or < 0)
|
|
{
|
|
throw new ArgumentOutOfRangeException(nameof(formattedCount));
|
|
}
|
|
LiteralLength = literalLength;
|
|
FormattedCount = formattedCount;
|
|
m_operations = new List<Op>(formattedCount * 2);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create from raw string. Null is treated as empty string
|
|
/// </summary>
|
|
public static ParsedTemplateString FromString(string rawString)
|
|
{
|
|
rawString ??= string.Empty;
|
|
var parsed = new ParsedTemplateString(rawString.Length, 0);
|
|
parsed.AddLiteral(rawString);
|
|
return parsed;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Number of literals in the string
|
|
/// </summary>
|
|
public int LiteralLength { get; }
|
|
|
|
/// <summary>
|
|
/// Number of tokens in the string
|
|
/// </summary>
|
|
public int FormattedCount { get; }
|
|
|
|
/// <summary>
|
|
/// Is multi line string
|
|
/// </summary>
|
|
public bool IsMultiLine
|
|
=> m_operations.Find(o => o.Type == OpType.LineBreak) != null;
|
|
|
|
/// <summary>
|
|
/// Arguments either cached or collected
|
|
/// </summary>
|
|
internal object[] Arguments => m_arguments ??=
|
|
[
|
|
.. m_operations
|
|
.Where(o => o.Type is OpType.Token or OpType.Value)
|
|
.Select(o => o.Item)
|
|
];
|
|
|
|
/// <summary>
|
|
/// Get formatting instructions
|
|
/// </summary>
|
|
public IReadOnlyList<Op> Operations => m_operations;
|
|
|
|
/// <inheritdoc/>
|
|
public override int ArgumentCount => Arguments.Length;
|
|
|
|
/// <inheritdoc/>
|
|
public override string Format
|
|
=> m_format ??= string.Concat(m_operations.Select(o => o.Item));
|
|
|
|
/// <inheritdoc/>
|
|
public override object GetArgument(int index)
|
|
{
|
|
return Arguments[index];
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override object[] GetArguments()
|
|
{
|
|
return Arguments;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public override string ToString(IFormatProvider? formatProvider)
|
|
{
|
|
return string.Format(formatProvider, Format, Arguments);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add a literal
|
|
/// </summary>
|
|
internal void AddLiteral(string item)
|
|
{
|
|
int strStartIdx = 0;
|
|
int strEndIdx = 0;
|
|
for (int i = 0; i < item.Length; i++)
|
|
{
|
|
if (item[i] == '\r' &&
|
|
i + 1 < item.Length &&
|
|
item[i + 1] == '\n')
|
|
{
|
|
// Strip out windows line feed
|
|
continue;
|
|
}
|
|
if (item[i] == '\n')
|
|
{
|
|
if (strStartIdx != strEndIdx)
|
|
{
|
|
Add(item[strStartIdx..strEndIdx]);
|
|
}
|
|
m_operations.Add(new Op(
|
|
OpType.LineBreak,
|
|
Environment.NewLine,
|
|
m_curOffset,
|
|
m_curLine));
|
|
m_arguments = null;
|
|
m_format = null;
|
|
m_curOffset = 0; // Reset offset at line break
|
|
strEndIdx = strStartIdx = i + 1;
|
|
m_curLine++;
|
|
continue;
|
|
}
|
|
strEndIdx++;
|
|
}
|
|
if (strStartIdx == strEndIdx)
|
|
{
|
|
return;
|
|
}
|
|
Add(strStartIdx == 0 && strEndIdx == item.Length - 1 ?
|
|
item : // Do not allocate unnecessary substring
|
|
item[strStartIdx..strEndIdx]);
|
|
void Add(string part)
|
|
{
|
|
if (part.Length == 0)
|
|
{
|
|
return;
|
|
}
|
|
m_operations.Add(new Op(
|
|
IsAllSpaces(part) ? OpType.WhiteSpace : OpType.Literal,
|
|
part,
|
|
m_curOffset,
|
|
m_curLine));
|
|
m_arguments = null;
|
|
m_format = null;
|
|
m_curOffset += part.Length;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Add formatted item
|
|
/// </summary>
|
|
internal void AddFormatted(string item, Type type)
|
|
{
|
|
m_operations.Add(new Op(
|
|
type == typeof(string) ? OpType.Token : OpType.Value,
|
|
item,
|
|
m_curOffset,
|
|
m_curLine));
|
|
m_arguments = null;
|
|
m_format = null;
|
|
m_curOffset += item.Length;
|
|
}
|
|
|
|
private static bool IsAllSpaces(string item)
|
|
{
|
|
for (int i = 0; i < item.Length; i++)
|
|
{
|
|
if (item[i] != ' ')
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
internal enum OpType
|
|
{
|
|
Literal,
|
|
WhiteSpace,
|
|
LineBreak,
|
|
Value,
|
|
Token
|
|
}
|
|
|
|
/// <summary>
|
|
/// Track the operations in the parsed string
|
|
/// </summary>
|
|
internal sealed record class Op(
|
|
OpType Type,
|
|
string Item,
|
|
int Offset,
|
|
int LineNumber);
|
|
|
|
private object[]? m_arguments;
|
|
private string? m_format;
|
|
private readonly List<Op> m_operations;
|
|
private int m_curOffset;
|
|
private int m_curLine;
|
|
}
|
|
}
|