Browse Source

Rename ParsedFile to CSharpParsedFile.

newNRvisualizers
Daniel Grunwald 14 years ago
parent
commit
a06110c255
  1. 2
      ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeSystemConvertVisitorTests.cs
  2. 2
      ICSharpCode.NRefactory.Tests/CSharp/Refactoring/TypeSystemAstBuilderTests.cs
  3. 4
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs
  4. 4
      ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs
  5. 10
      ICSharpCode.NRefactory/CSharp/Parser/TypeSystemConvertVisitor.cs
  6. 13
      ICSharpCode.NRefactory/CSharp/Resolver/FindReferences.cs
  7. 2
      ICSharpCode.NRefactory/CSharp/Resolver/ResolveAtLocation.cs
  8. 6
      ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs

2
ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeSystemConvertVisitorTests.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
} }
var testCasePC = new SimpleProjectContent(); var testCasePC = new SimpleProjectContent();
ParsedFile parsedFile = new TypeSystemConvertVisitor(testCasePC, fileName).Convert(cu); CSharpParsedFile parsedFile = new TypeSystemConvertVisitor(testCasePC, fileName).Convert(cu);
parsedFile.Freeze(); parsedFile.Freeze();
testCasePC.UpdateProjectContent(null, parsedFile); testCasePC.UpdateProjectContent(null, parsedFile);
return testCasePC; return testCasePC;

2
ICSharpCode.NRefactory.Tests/CSharp/Refactoring/TypeSystemAstBuilderTests.cs

@ -55,7 +55,7 @@ namespace OtherNS {
SimpleProjectContent pc; SimpleProjectContent pc;
ITypeResolveContext ctx; ITypeResolveContext ctx;
ITypeDefinition baseClass, derivedClass, nestedClass, systemClass; ITypeDefinition baseClass, derivedClass, nestedClass, systemClass;
ParsedFile parsedFile; CSharpParsedFile parsedFile;
[SetUp] [SetUp]
public void SetUp() public void SetUp()

4
ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs

@ -194,7 +194,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
SetUp(); SetUp();
ParsedFile parsedFile = new ParsedFile("test.cs", resolver.CurrentUsingScope); CSharpParsedFile parsedFile = new CSharpParsedFile("test.cs", resolver.CurrentUsingScope);
TypeSystemConvertVisitor convertVisitor = new TypeSystemConvertVisitor(parsedFile, resolver.CurrentUsingScope, null); TypeSystemConvertVisitor convertVisitor = new TypeSystemConvertVisitor(parsedFile, resolver.CurrentUsingScope, null);
cu.AcceptVisitor(convertVisitor, null); cu.AcceptVisitor(convertVisitor, null);
project.UpdateProjectContent(null, convertVisitor.ParsedFile); project.UpdateProjectContent(null, convertVisitor.ParsedFile);
@ -259,7 +259,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
SetUp(); SetUp();
ParsedFile parsedFile = new ParsedFile("test.cs", resolver.CurrentUsingScope); CSharpParsedFile parsedFile = new CSharpParsedFile("test.cs", resolver.CurrentUsingScope);
TypeSystemConvertVisitor convertVisitor = new TypeSystemConvertVisitor(parsedFile, resolver.CurrentUsingScope, null); TypeSystemConvertVisitor convertVisitor = new TypeSystemConvertVisitor(parsedFile, resolver.CurrentUsingScope, null);
cu.AcceptVisitor(convertVisitor, null); cu.AcceptVisitor(convertVisitor, null);
project.UpdateProjectContent(null, convertVisitor.ParsedFile); project.UpdateProjectContent(null, convertVisitor.ParsedFile);

4
ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.CSharp
/// Represents a file that was parsed and converted for the type system. /// Represents a file that was parsed and converted for the type system.
/// </summary> /// </summary>
[Serializable] [Serializable]
public sealed class ParsedFile : AbstractFreezable, IParsedFile public sealed class CSharpParsedFile : AbstractFreezable, IParsedFile
{ {
readonly string fileName; readonly string fileName;
readonly UsingScope rootUsingScope; readonly UsingScope rootUsingScope;
@ -48,7 +48,7 @@ namespace ICSharpCode.NRefactory.CSharp
usingScopes = FreezeList(usingScopes); usingScopes = FreezeList(usingScopes);
} }
public ParsedFile(string fileName, UsingScope rootUsingScope) public CSharpParsedFile(string fileName, UsingScope rootUsingScope)
{ {
if (fileName == null) if (fileName == null)
throw new ArgumentNullException("fileName"); throw new ArgumentNullException("fileName");

10
ICSharpCode.NRefactory/CSharp/Parser/TypeSystemConvertVisitor.cs

@ -34,7 +34,7 @@ namespace ICSharpCode.NRefactory.CSharp
/// </summary> /// </summary>
public class TypeSystemConvertVisitor : DepthFirstAstVisitor<object, IEntity> public class TypeSystemConvertVisitor : DepthFirstAstVisitor<object, IEntity>
{ {
readonly ParsedFile parsedFile; readonly CSharpParsedFile parsedFile;
UsingScope usingScope; UsingScope usingScope;
DefaultTypeDefinition currentTypeDefinition; DefaultTypeDefinition currentTypeDefinition;
DefaultMethod currentMethod; DefaultMethod currentMethod;
@ -61,7 +61,7 @@ namespace ICSharpCode.NRefactory.CSharp
throw new ArgumentNullException("pc"); throw new ArgumentNullException("pc");
if (fileName == null) if (fileName == null)
throw new ArgumentNullException("fileName"); throw new ArgumentNullException("fileName");
this.parsedFile = new ParsedFile(fileName, new UsingScope(pc)); this.parsedFile = new CSharpParsedFile(fileName, new UsingScope(pc));
this.usingScope = parsedFile.RootUsingScope; this.usingScope = parsedFile.RootUsingScope;
} }
@ -71,7 +71,7 @@ namespace ICSharpCode.NRefactory.CSharp
/// <param name="parsedFile">The parsed file to which members should be added.</param> /// <param name="parsedFile">The parsed file to which members should be added.</param>
/// <param name="currentUsingScope">The current using scope.</param> /// <param name="currentUsingScope">The current using scope.</param>
/// <param name="currentTypeDefinition">The current type definition.</param> /// <param name="currentTypeDefinition">The current type definition.</param>
public TypeSystemConvertVisitor(ParsedFile parsedFile, UsingScope currentUsingScope = null, DefaultTypeDefinition currentTypeDefinition = null) public TypeSystemConvertVisitor(CSharpParsedFile parsedFile, UsingScope currentUsingScope = null, DefaultTypeDefinition currentTypeDefinition = null)
{ {
if (parsedFile == null) if (parsedFile == null)
throw new ArgumentNullException("parsedFile"); throw new ArgumentNullException("parsedFile");
@ -80,13 +80,13 @@ namespace ICSharpCode.NRefactory.CSharp
this.currentTypeDefinition = currentTypeDefinition; this.currentTypeDefinition = currentTypeDefinition;
} }
public ParsedFile Convert(AstNode node) public CSharpParsedFile Convert(AstNode node)
{ {
node.AcceptVisitor(this, null); node.AcceptVisitor(this, null);
return parsedFile; return parsedFile;
} }
public ParsedFile ParsedFile { public CSharpParsedFile ParsedFile {
get { return parsedFile; } get { return parsedFile; }
} }

13
ICSharpCode.NRefactory/CSharp/Resolver/FindReferences.cs

@ -29,7 +29,12 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// <summary> /// <summary>
/// 'Find references' implementation. /// 'Find references' implementation.
/// </summary> /// </summary>
public class FindReferences /// <remarks>
/// This class is thread-safe.
/// The intended multi-threaded usage is to call GetSearchScopes() once, and then
/// call FindReferencesInFile() concurrently on multiple threads (parallel foreach over all interesting files).
/// </remarks>
public sealed class FindReferences
{ {
CancellationToken cancellationToken; CancellationToken cancellationToken;
@ -220,7 +225,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
} }
#endregion #endregion
#region FindReferencesInSolution #region GetInterestingFileNames
/// <summary> /// <summary>
/// Gets the file names that possibly contain references to the element being searched for. /// Gets the file names that possibly contain references to the element being searched for.
/// </summary> /// </summary>
@ -280,7 +285,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// <param name="parsedFile">The type system representation of the file being searched.</param> /// <param name="parsedFile">The type system representation of the file being searched.</param>
/// <param name="compilationUnit">The compilation unit of the file being searched.</param> /// <param name="compilationUnit">The compilation unit of the file being searched.</param>
/// <param name="context">The type resolve context to use for resolving the file.</param> /// <param name="context">The type resolve context to use for resolving the file.</param>
public void FindReferencesInFile(SearchScope searchScope, ParsedFile parsedFile, CompilationUnit compilationUnit, ITypeResolveContext context) public void FindReferencesInFile(SearchScope searchScope, CSharpParsedFile parsedFile, CompilationUnit compilationUnit, ITypeResolveContext context)
{ {
if (searchScope == null) if (searchScope == null)
throw new ArgumentNullException("searchScope"); throw new ArgumentNullException("searchScope");
@ -294,7 +299,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// <param name="parsedFile">The type system representation of the file being searched.</param> /// <param name="parsedFile">The type system representation of the file being searched.</param>
/// <param name="compilationUnit">The compilation unit of the file being searched.</param> /// <param name="compilationUnit">The compilation unit of the file being searched.</param>
/// <param name="context">The type resolve context to use for resolving the file.</param> /// <param name="context">The type resolve context to use for resolving the file.</param>
public void FindReferencesInFile(IList<SearchScope> searchScopes, ParsedFile parsedFile, CompilationUnit compilationUnit, ITypeResolveContext context) public void FindReferencesInFile(IList<SearchScope> searchScopes, CSharpParsedFile parsedFile, CompilationUnit compilationUnit, ITypeResolveContext context)
{ {
if (searchScopes == null) if (searchScopes == null)
throw new ArgumentNullException("searchScopes"); throw new ArgumentNullException("searchScopes");

2
ICSharpCode.NRefactory/CSharp/Resolver/ResolveAtLocation.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// </summary> /// </summary>
public static class ResolveAtLocation public static class ResolveAtLocation
{ {
public static ResolveResult Resolve(ITypeResolveContext context, ParsedFile parsedFile, CompilationUnit cu, AstLocation location, public static ResolveResult Resolve(ITypeResolveContext context, CSharpParsedFile parsedFile, CompilationUnit cu, AstLocation location,
CancellationToken cancellationToken = default(CancellationToken)) CancellationToken cancellationToken = default(CancellationToken))
{ {
AstNode node = cu.GetNodeAt(location); AstNode node = cu.GetNodeAt(location);

6
ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs

@ -62,7 +62,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
SimpleNameLookupMode currentTypeLookupMode = SimpleNameLookupMode.Type; SimpleNameLookupMode currentTypeLookupMode = SimpleNameLookupMode.Type;
/// <summary>Resolve result of the current LINQ query</summary> /// <summary>Resolve result of the current LINQ query</summary>
ResolveResult currentQueryResult; ResolveResult currentQueryResult;
readonly ParsedFile parsedFile; readonly CSharpParsedFile parsedFile;
readonly Dictionary<AstNode, ResolveResult> resolveResultCache = new Dictionary<AstNode, ResolveResult>(); readonly Dictionary<AstNode, ResolveResult> resolveResultCache = new Dictionary<AstNode, ResolveResult>();
readonly Dictionary<AstNode, CSharpResolver> resolverBeforeDict = new Dictionary<AstNode, CSharpResolver>(); readonly Dictionary<AstNode, CSharpResolver> resolverBeforeDict = new Dictionary<AstNode, CSharpResolver>();
@ -89,7 +89,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// If you pass <c>null</c>, then nothing will be resolved on the initial scan, and the resolver /// If you pass <c>null</c>, then nothing will be resolved on the initial scan, and the resolver
/// will resolve additional nodes on demand (when one of the Get-methods is called). /// will resolve additional nodes on demand (when one of the Get-methods is called).
/// </param> /// </param>
public ResolveVisitor(CSharpResolver resolver, ParsedFile parsedFile, IResolveVisitorNavigator navigator = null) public ResolveVisitor(CSharpResolver resolver, CSharpParsedFile parsedFile, IResolveVisitorNavigator navigator = null)
{ {
if (resolver == null) if (resolver == null)
throw new ArgumentNullException("resolver"); throw new ArgumentNullException("resolver");
@ -1798,7 +1798,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
readonly QuerySelectClause selectClause; readonly QuerySelectClause selectClause;
readonly CSharpResolver storedContext; readonly CSharpResolver storedContext;
readonly ParsedFile parsedFile; readonly CSharpParsedFile parsedFile;
readonly List<LambdaTypeHypothesis> hypotheses = new List<LambdaTypeHypothesis>(); readonly List<LambdaTypeHypothesis> hypotheses = new List<LambdaTypeHypothesis>();
readonly List<IParameter> parameters = new List<IParameter>(); readonly List<IParameter> parameters = new List<IParameter>();

Loading…
Cancel
Save