huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a couple of missing `global::` prefixes 

- was missing when writing out full name of an `enum` value
- was missing in one case when writing out `TagHelperAttribute` type name

nit: updated `CSharpTagHelperFieldDeclarationVisitor.WritePrivateField()` to always include the prefix
- no change in generated code but centralizes the prefix addition and reduces intermediate `string`s
This commit is contained in:
Doug Bunting 2016-03-26 19:12:36 -07:00
parent 21be7973ea
commit a8d4da9f17
7 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
View File

@ -654,7 +654,9 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
{ {
if (attributeDescriptor.IsEnum && isPlainTextValue) if (attributeDescriptor.IsEnum && isPlainTextValue)
{ {
writer.Write(attributeDescriptor.TypeName) writer
.Write("global::")
.Write(attributeDescriptor.TypeName)
.Write("."); .Write(".");
} }

12
src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
View File

@ -54,18 +54,18 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
// whether it's used depends on how a TagHelper is used. // whether it's used depends on how a TagHelper is used.
Writer.WritePragma("warning disable 0414"); Writer.WritePragma("warning disable 0414");
WritePrivateField( WritePrivateField(
"global::" + _tagHelperContext.TagHelperContentTypeName, _tagHelperContext.TagHelperContentTypeName,
CSharpTagHelperCodeRenderer.StringValueBufferVariableName, CSharpTagHelperCodeRenderer.StringValueBufferVariableName,
value: null); value: null);
Writer.WritePragma("warning restore 0414"); Writer.WritePragma("warning restore 0414");
WritePrivateField( WritePrivateField(
"global::" + _tagHelperContext.ExecutionContextTypeName, _tagHelperContext.ExecutionContextTypeName,
CSharpTagHelperCodeRenderer.ExecutionContextVariableName, CSharpTagHelperCodeRenderer.ExecutionContextVariableName,
value: null); value: null);
WritePrivateField( WritePrivateField(
"global::" + _tagHelperContext.RunnerTypeName, _tagHelperContext.RunnerTypeName,
CSharpTagHelperCodeRenderer.RunnerVariableName, CSharpTagHelperCodeRenderer.RunnerVariableName,
value: null); value: null);
@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
_declaredTagHelpers.Add(descriptor.TypeName); _declaredTagHelpers.Add(descriptor.TypeName);
WritePrivateField( WritePrivateField(
"global::" + descriptor.TypeName, descriptor.TypeName,
CSharpTagHelperCodeRenderer.GetVariableName(descriptor), CSharpTagHelperCodeRenderer.GetVariableName(descriptor),
value: null); value: null);
} }
@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
.Write(" ") .Write(" ")
.Write(preAllocatedAttributeVariableName) .Write(preAllocatedAttributeVariableName)
.Write(" = ") .Write(" = ")
.WriteStartNewObject(_tagHelperContext.TagHelperAttributeTypeName) .WriteStartNewObject("global::" + _tagHelperContext.TagHelperAttributeTypeName)
.WriteStringLiteral(attribute.Key) .WriteStringLiteral(attribute.Key)
.WriteEndMethodInvocation(); .WriteEndMethodInvocation();
} }
@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
private void WritePrivateField(string type, string name, string value) private void WritePrivateField(string type, string name, string value)
{ {
Writer Writer
.Write("private ") .Write("private global::")
.WriteVariableDeclaration(type, name, value); .WriteVariableDeclaration(type, name, value);
} }

16
test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
View File

@ -1839,31 +1839,31 @@ namespace Microsoft.AspNetCore.Razor.Test.Generator
documentAbsoluteIndex: 169, documentAbsoluteIndex: 169,
documentLineIndex: 8, documentLineIndex: 8,
documentCharacterOffsetIndex: 14, documentCharacterOffsetIndex: 14,
generatedAbsoluteIndex: 1921, generatedAbsoluteIndex: 1929,
generatedLineIndex: 50, generatedLineIndex: 50,
generatedCharacterOffsetIndex: 88, generatedCharacterOffsetIndex: 96,
contentLength: 7), contentLength: 7),
BuildLineMapping( BuildLineMapping(
documentAbsoluteIndex: 196, documentAbsoluteIndex: 196,
documentLineIndex: 9, documentLineIndex: 9,
documentCharacterOffsetIndex: 14, documentCharacterOffsetIndex: 14,
generatedAbsoluteIndex: 2296, generatedAbsoluteIndex: 2312,
generatedLineIndex: 57, generatedLineIndex: 57,
generatedCharacterOffsetIndex: 88, generatedCharacterOffsetIndex: 96,
contentLength: 13), contentLength: 13),
BuildLineMapping( BuildLineMapping(
documentAbsoluteIndex: 222, documentAbsoluteIndex: 222,
documentLineIndex: 9, documentLineIndex: 9,
documentCharacterOffsetIndex: 40, documentCharacterOffsetIndex: 40,
generatedAbsoluteIndex: 2471, generatedAbsoluteIndex: 2495,
generatedLineIndex: 62, generatedLineIndex: 62,
generatedCharacterOffsetIndex: 94, generatedCharacterOffsetIndex: 102,
contentLength: 7), contentLength: 7),
BuildLineMapping( BuildLineMapping(
documentAbsoluteIndex: 249, documentAbsoluteIndex: 249,
documentLineIndex: 10, documentLineIndex: 10,
documentCharacterOffsetIndex: 15, documentCharacterOffsetIndex: 15,
generatedAbsoluteIndex: 2797, generatedAbsoluteIndex: 2821,
generatedLineIndex: 69, generatedLineIndex: 69,
generatedCharacterOffsetIndex: 39, generatedCharacterOffsetIndex: 39,
contentLength: 9), contentLength: 9),
@ -1871,7 +1871,7 @@ namespace Microsoft.AspNetCore.Razor.Test.Generator
documentAbsoluteIndex: 272, documentAbsoluteIndex: 272,
documentLineIndex: 10, documentLineIndex: 10,
documentCharacterOffsetIndex: 38, documentCharacterOffsetIndex: 38,
generatedAbsoluteIndex: 2919, generatedAbsoluteIndex: 2943,
generatedLineIndex: 74, generatedLineIndex: 74,
generatedCharacterOffsetIndex: 45, generatedCharacterOffsetIndex: 45,
contentLength: 9), contentLength: 9),

6
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
View File

@ -48,19 +48,19 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>(); __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>(); __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
#line 9 "EnumTagHelpers.cshtml" #line 9 "EnumTagHelpers.cshtml"
__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue; __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
#line default #line default
#line hidden #line hidden
__TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>(); __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>(); __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
#line 10 "EnumTagHelpers.cshtml" #line 10 "EnumTagHelpers.cshtml"
__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue; __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue;
#line default #line default
#line hidden #line hidden
#line 10 "EnumTagHelpers.cshtml" #line 10 "EnumTagHelpers.cshtml"
__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue; __TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
#line default #line default
#line hidden #line hidden

6
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
View File

@ -88,7 +88,7 @@ AddHtmlAttributeValue("", 128, MyEnum.MySecondValue, 128, 21, false);
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>(); __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
#line 9 "EnumTagHelpers.cshtml" #line 9 "EnumTagHelpers.cshtml"
__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue; __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
#line default #line default
#line hidden #line hidden
@ -109,13 +109,13 @@ __TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>(); __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
#line 10 "EnumTagHelpers.cshtml" #line 10 "EnumTagHelpers.cshtml"
__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue; __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue;
#line default #line default
#line hidden #line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value);
#line 10 "EnumTagHelpers.cshtml" #line 10 "EnumTagHelpers.cshtml"
__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue; __TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
#line default #line default
#line hidden #line hidden

4
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
View File

@ -14,10 +14,10 @@ namespace TestOutput
private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager(); private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-unbound-required"); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-unbound-required");
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("btn")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("class", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("btn"));
private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null; private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required"); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required");
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("hello")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("catchall-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("hello"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("hello2")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("input-unbound-required", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("hello2"));
#line hidden #line hidden

4
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
View File

@ -14,13 +14,13 @@ namespace TestOutput
private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null; private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager(); private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null; private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bound"); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_0 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("bound");
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[item]", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("items")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_1 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[item]", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("items"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[(item)]", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("items")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("[(item)]", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("items"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(click)", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("doSomething()")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(click)", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("doSomething()"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(^click)", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("doSomething()")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("(^click)", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("doSomething()"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("*something", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("value")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("*something", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("value"));
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#localminimized"); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_6 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#localminimized");
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("value")); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_7 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("#local", new global::Microsoft.AspNetCore.Html.HtmlEncodedString("value"));
#line hidden #line hidden
public SymbolBoundAttributes() public SymbolBoundAttributes()