From edf1af0f84fa429a2abefa291a9be3ed625de68f Mon Sep 17 00:00:00 2001 From: asilverman Date: Mon, 16 Oct 2023 15:22:57 -0700 Subject: [PATCH] rename --- src/Bicep.Core/Syntax/ImportSpecification.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Bicep.Core/Syntax/ImportSpecification.cs b/src/Bicep.Core/Syntax/ImportSpecification.cs index e076cd48537..b51546470f5 100644 --- a/src/Bicep.Core/Syntax/ImportSpecification.cs +++ b/src/Bicep.Core/Syntax/ImportSpecification.cs @@ -24,20 +24,19 @@ public class ImportSpecification : ISymbolNameSource // language=regex private const string SemanticVersionPattern = @"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?"; - private static readonly Regex BareSpecification = new( - @$"(?{NamePattern})@(?{SemanticVersionPattern})$"); + private static readonly Regex BareSpecification = new(@$"(?{NamePattern})@(?{SemanticVersionPattern})$"); - private ImportSpecification(string unqualifiedAddress, string name, string version, bool isValid, TextSpan span) + private ImportSpecification(string triviaPath, string name, string version, bool isValid, TextSpan span) { - UnqualifiedAddress = unqualifiedAddress; + TriviaPath = triviaPath; Name = name; Version = version; IsValid = isValid; Span = span; } - private string UnqualifiedAddress { get; } + private string TriviaPath { get; } public string Name { get; } @@ -76,7 +75,7 @@ public SyntaxBase ToPath() { return new SkippedTriviaSyntax(this.Span, Enumerable.Empty()); } - return SyntaxFactory.CreateStringLiteral(this.UnqualifiedAddress); + return SyntaxFactory.CreateStringLiteral(this.TriviaPath); } private static ImportSpecification CreateFromStringSyntax(StringSyntax stringSyntax, string value) @@ -96,7 +95,7 @@ private static ImportSpecification CreateFromStringSyntax(StringSyntax stringSyn var version = match.Groups["version"].Value; var parts = value.Split('@'); var artifactAddress = parts[0]; - + var span = new TextSpan(stringSyntax.Span.Position + 1, artifactAddress.Length); return new(string.Join(':', parts), name, version, artifactAddress != "az", span);