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

Remove unneeded NamespaceKeywordLength from AddImportCodeGenerator. 

- This was completely unused outside of the AddImportCodeGenerator.
This commit is contained in:
N. Taylor Mullen 2015-05-18 17:21:50 -07:00
parent 94f2f904b3
commit 407a2ceae6
7 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNet.Razor/Generator/AddImportCodeGenerator.cs
View File

@ -8,21 +8,18 @@ namespace Microsoft.AspNet.Razor.Generator
{ {
public class AddImportCodeGenerator : SpanCodeGenerator public class AddImportCodeGenerator : SpanCodeGenerator
{ {
public AddImportCodeGenerator(string ns, int namespaceKeywordLength) public AddImportCodeGenerator(string ns)
{ {
Namespace = ns; Namespace = ns;
NamespaceKeywordLength = namespaceKeywordLength;
} }
public string Namespace { get; } public string Namespace { get; }
public int NamespaceKeywordLength { get; set; }
public override void GenerateCode(Span target, CodeGeneratorContext context) public override void GenerateCode(Span target, CodeGeneratorContext context)
{ {
var ns = Namespace; var ns = Namespace;
if (!string.IsNullOrEmpty(ns) && Char.IsWhiteSpace(ns[0])) if (!string.IsNullOrEmpty(ns) && char.IsWhiteSpace(ns[0]))
{ {
ns = ns.Substring(1); ns = ns.Substring(1);
} }
@ -32,15 +29,14 @@ namespace Microsoft.AspNet.Razor.Generator
public override string ToString() public override string ToString()
{ {
return "Import:" + Namespace + ";KwdLen:" + NamespaceKeywordLength; return "Import:" + Namespace + ";";
} }
public override bool Equals(object obj) public override bool Equals(object obj)
{ {
var other = obj as AddImportCodeGenerator; var other = obj as AddImportCodeGenerator;
return other != null && return other != null &&
string.Equals(Namespace, other.Namespace, StringComparison.Ordinal) && string.Equals(Namespace, other.Namespace, StringComparison.Ordinal);
NamespaceKeywordLength == other.NamespaceKeywordLength;
} }
public override int GetHashCode() public override int GetHashCode()

3
src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs
View File

@ -150,8 +150,7 @@ namespace Microsoft.AspNet.Razor.Parser
Span.EditHandler.AcceptedCharacters = AcceptedCharacters.AnyExceptNewline; Span.EditHandler.AcceptedCharacters = AcceptedCharacters.AnyExceptNewline;
Span.CodeGenerator = new AddImportCodeGenerator( Span.CodeGenerator = new AddImportCodeGenerator(
Span.GetContent(syms => syms.Skip(1)), // Skip "using" Span.GetContent(syms => syms.Skip(1)));
SyntaxConstants.CSharp.UsingKeywordLength);
// Optional ";" // Optional ";"
if (EnsureCurrent()) if (EnsureCurrent())

4
test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs
View File

@ -298,9 +298,9 @@ namespace Microsoft.AspNet.Razor.Test.Framework
return _self.With(new TypeMemberCodeGenerator()); return _self.With(new TypeMemberCodeGenerator());
} }
public SpanConstructor AsNamespaceImport(string ns, int namespaceKeywordLength) public SpanConstructor AsNamespaceImport(string ns)
{ {
return _self.With(new AddImportCodeGenerator(ns, namespaceKeywordLength)); return _self.With(new AddImportCodeGenerator(ns));
} }
public SpanConstructor Hidden() public SpanConstructor Hidden()

33
test/Microsoft.AspNet.Razor.Test/Generator/AddImportCodeGeneratorTest.cs
View File

@ -14,12 +14,12 @@ namespace Microsoft.AspNet.Razor.Generator
return new TheoryData<AddImportCodeGenerator, AddImportCodeGenerator> return new TheoryData<AddImportCodeGenerator, AddImportCodeGenerator>
{ {
{ {
new AddImportCodeGenerator(ns: null, namespaceKeywordLength: 3), new AddImportCodeGenerator(ns: null),
new AddImportCodeGenerator(ns: null, namespaceKeywordLength: 3) new AddImportCodeGenerator(ns: null)
}, },
{ {
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23), new AddImportCodeGenerator(ns: "Fred"),
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23) new AddImportCodeGenerator(ns: "Fred")
}, },
}; };
} }
@ -32,40 +32,35 @@ namespace Microsoft.AspNet.Razor.Generator
return new TheoryData<AddImportCodeGenerator, object> return new TheoryData<AddImportCodeGenerator, object>
{ {
{ {
new AddImportCodeGenerator(ns: null, namespaceKeywordLength: 0), new AddImportCodeGenerator(ns: null),
null null
}, },
{ {
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23), new AddImportCodeGenerator(ns: "Fred"),
null null
}, },
{ {
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23), new AddImportCodeGenerator(ns: "Fred"),
new object() new object()
}, },
{ {
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23), new AddImportCodeGenerator(ns: "Fred"),
SpanCodeGenerator.Null SpanCodeGenerator.Null
}, },
{ {
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 23), new AddImportCodeGenerator(ns: "Fred"),
new StatementCodeGenerator() new StatementCodeGenerator()
}, },
{ {
// Different Namespace. // Different Namespace.
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 3), new AddImportCodeGenerator(ns: "Fred"),
new AddImportCodeGenerator(ns: "Ginger", namespaceKeywordLength: 3) new AddImportCodeGenerator(ns: "Ginger")
}, },
{ {
// Different Namespace (case sensitive). // Different Namespace (case sensitive).
new AddImportCodeGenerator(ns: "fred", namespaceKeywordLength: 9), new AddImportCodeGenerator(ns: "fred"),
new AddImportCodeGenerator(ns: "FRED", namespaceKeywordLength: 9) new AddImportCodeGenerator(ns: "FRED")
}, }
{
// Different NamespaceKeywordLength.
new AddImportCodeGenerator(ns: null, namespaceKeywordLength: 0),
new AddImportCodeGenerator(ns: null, namespaceKeywordLength: 23)
},
}; };
} }
} }

2
test/Microsoft.AspNet.Razor.Test/Generator/RazorCommentCodeGeneratorTest.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Razor.Generator
{ new RazorCommentCodeGenerator(), new TemplateBlockCodeGenerator() }, { new RazorCommentCodeGenerator(), new TemplateBlockCodeGenerator() },
{ {
new RazorCommentCodeGenerator(), new RazorCommentCodeGenerator(),
new AddImportCodeGenerator(ns: "Fred", namespaceKeywordLength: 0) new AddImportCodeGenerator(ns: "Fred")
}, },
}; };
} }

4
test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
View File

@ -370,7 +370,7 @@ while(true);", BlockType.Statement, SpanKind.Code, acceptedCharacters: AcceptedC
ParseBlockTest("using Foo ", ParseBlockTest("using Foo ",
new DirectiveBlock( new DirectiveBlock(
Factory.Code("using Foo") Factory.Code("using Foo")
.AsNamespaceImport(" Foo", CSharpCodeParser.UsingKeywordLength) .AsNamespaceImport(" Foo")
.Accepts(AcceptedCharacters.NonWhiteSpace | AcceptedCharacters.WhiteSpace))); .Accepts(AcceptedCharacters.NonWhiteSpace | AcceptedCharacters.WhiteSpace)));
} }
@ -1099,7 +1099,7 @@ catch(bar) { baz(); }", BlockType.Statement, SpanKind.Code);
ParseBlockTest(content, ParseBlockTest(content,
new DirectiveBlock( new DirectiveBlock(
Factory.Code(content) Factory.Code(content)
.AsNamespaceImport(expectedNS, CSharpCodeParser.UsingKeywordLength) .AsNamespaceImport(expectedNS)
.Accepts(acceptedCharacters)), .Accepts(acceptedCharacters)),
errors); errors);
} }

4
test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
View File

@ -167,7 +167,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.Code("using StringDictionary = System.Collections.Generic.Dictionary<string, string>") Factory.Code("using StringDictionary = System.Collections.Generic.Dictionary<string, string>")
.AsNamespaceImport(" StringDictionary = System.Collections.Generic.Dictionary<string, string>", 5) .AsNamespaceImport(" StringDictionary = System.Collections.Generic.Dictionary<string, string>")
.Accepts(AcceptedCharacters.AnyExceptNewline) .Accepts(AcceptedCharacters.AnyExceptNewline)
)); ));
} }
@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.Code("using System.Text.Encoding.ASCIIEncoding") Factory.Code("using System.Text.Encoding.ASCIIEncoding")
.AsNamespaceImport(" System.Text.Encoding.ASCIIEncoding", 5) .AsNamespaceImport(" System.Text.Encoding.ASCIIEncoding")
.Accepts(AcceptedCharacters.AnyExceptNewline) .Accepts(AcceptedCharacters.AnyExceptNewline)
)); ));
} }