|
|
|
@ -46,6 +46,17 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static ITypeResolveContext CurrentTypeResolveContext { |
|
|
|
|
|
|
|
get { |
|
|
|
|
|
|
|
throw new NotImplementedException(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public static ITypeResolveContext GetTypeResolveContext(IProject project) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
throw new NotImplementedException(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static IProjectContent GetProjectContent(IProject project) |
|
|
|
public static IProjectContent GetProjectContent(IProject project) |
|
|
|
{ |
|
|
|
{ |
|
|
|
lock (projectContents) { |
|
|
|
lock (projectContents) { |
|
|
|
@ -171,7 +182,7 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
if (GetParser(fileName) == null) |
|
|
|
if (GetParser(fileName) == null) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
ITextBuffer snapshot; |
|
|
|
ITextSource snapshot; |
|
|
|
IEditable editable = viewContent as IEditable; |
|
|
|
IEditable editable = viewContent as IEditable; |
|
|
|
if (editable != null) |
|
|
|
if (editable != null) |
|
|
|
snapshot = editable.CreateSnapshot(); |
|
|
|
snapshot = editable.CreateSnapshot(); |
|
|
|
@ -179,8 +190,8 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
snapshot = GetParseableFileContent(viewContent.PrimaryFileName); |
|
|
|
snapshot = GetParseableFileContent(viewContent.PrimaryFileName); |
|
|
|
|
|
|
|
|
|
|
|
lastParseRun = BeginParse(fileName, snapshot).ContinueWith( |
|
|
|
lastParseRun = BeginParse(fileName, snapshot).ContinueWith( |
|
|
|
delegate(Task<ParseInformation> backgroundTask) { |
|
|
|
delegate(Task<IParsedFile> backgroundTask) { |
|
|
|
ParseInformation parseInfo = backgroundTask.Result; |
|
|
|
IParsedFile parseInfo = backgroundTask.Result; |
|
|
|
RaiseParserUpdateStepFinished(new ParserUpdateStepEventArgs(fileName, snapshot, parseInfo)); |
|
|
|
RaiseParserUpdateStepFinished(new ParserUpdateStepEventArgs(fileName, snapshot, parseInfo)); |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -270,7 +281,7 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
#endregion
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
#region Parse Information Management
|
|
|
|
#region Parse Information Management
|
|
|
|
static readonly IParsedFile[] emptyCompilationUnitArray = new ICompilationUnit[0]; |
|
|
|
static readonly IParsedFile[] emptyCompilationUnitArray = new IParsedFile[0]; |
|
|
|
|
|
|
|
|
|
|
|
sealed class FileEntry |
|
|
|
sealed class FileEntry |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -300,7 +311,7 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
|
|
|
|
|
|
|
|
public IParsedFile GetParseInformation(IProjectContent content) |
|
|
|
public IParsedFile GetParseInformation(IProjectContent content) |
|
|
|
{ |
|
|
|
{ |
|
|
|
ParseInformation p = GetExistingParseInformation(content); |
|
|
|
IParsedFile p = GetExistingParseInformation(content); |
|
|
|
if (p != null) |
|
|
|
if (p != null) |
|
|
|
return p; |
|
|
|
return p; |
|
|
|
else |
|
|
|
else |
|
|
|
@ -317,7 +328,7 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
return p; |
|
|
|
return p; |
|
|
|
lock (this) { |
|
|
|
lock (this) { |
|
|
|
if (this.oldUnits != null) { |
|
|
|
if (this.oldUnits != null) { |
|
|
|
ICompilationUnit cu = this.oldUnits.FirstOrDefault(c => c.ProjectContent == content); |
|
|
|
IParsedFile cu = this.oldUnits.FirstOrDefault(c => c.ProjectContent == content); |
|
|
|
return cu; |
|
|
|
return cu; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
@ -349,7 +360,7 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
// Detect when a file belongs to multiple projects but the ParserService hasn't realized
|
|
|
|
// Detect when a file belongs to multiple projects but the ParserService hasn't realized
|
|
|
|
// that, yet. In this case, do another parse run to detect all parent projects.
|
|
|
|
// that, yet. In this case, do another parse run to detect all parent projects.
|
|
|
|
if (!(parentProjectContent != null && this.oldUnits.Length == 1 && this.oldUnits[0].ProjectContent != parentProjectContent)) { |
|
|
|
if (!(parentProjectContent != null && this.oldUnits.Length == 1 && this.oldUnits[0].ProjectContent != parentProjectContent)) { |
|
|
|
return this.parseInfo; |
|
|
|
return this.mainParseInfo; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -368,8 +379,8 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
// risking deadlocks.
|
|
|
|
// risking deadlocks.
|
|
|
|
|
|
|
|
|
|
|
|
// parse once for each project content that contains the file
|
|
|
|
// parse once for each project content that contains the file
|
|
|
|
ICompilationUnit[] newUnits = new ICompilationUnit[projectContents.Count]; |
|
|
|
IParsedFile[] newUnits = new IParsedFile[projectContents.Count]; |
|
|
|
ICompilationUnit resultUnit = null; |
|
|
|
IParsedFile resultUnit = null; |
|
|
|
for (int i = 0; i < newUnits.Length; i++) { |
|
|
|
for (int i = 0; i < newUnits.Length; i++) { |
|
|
|
IProjectContent pc = projectContents[i]; |
|
|
|
IProjectContent pc = projectContents[i]; |
|
|
|
try { |
|
|
|
try { |
|
|
|
@ -387,59 +398,58 @@ namespace ICSharpCode.SharpDevelop |
|
|
|
// ensure we never go backwards in time (we need to repeat this check after we've reacquired the lock)
|
|
|
|
// ensure we never go backwards in time (we need to repeat this check after we've reacquired the lock)
|
|
|
|
if (fileContentVersion != null && this.bufferVersion != null && this.bufferVersion.BelongsToSameDocumentAs(fileContentVersion)) { |
|
|
|
if (fileContentVersion != null && this.bufferVersion != null && this.bufferVersion.BelongsToSameDocumentAs(fileContentVersion)) { |
|
|
|
if (this.bufferVersion.CompareAge(fileContentVersion) >= 0) { |
|
|
|
if (this.bufferVersion.CompareAge(fileContentVersion) >= 0) { |
|
|
|
if (parentProjectContent != null && parentProjectContent != parseInfo.CompilationUnit.ProjectContent) { |
|
|
|
if (parentProjectContent != null) { |
|
|
|
ICompilationUnit oldUnit = oldUnits.FirstOrDefault(o => o.ProjectContent == parentProjectContent); |
|
|
|
IParsedFile oldUnit = oldUnits.FirstOrDefault(o => o.ProjectContent == parentProjectContent); |
|
|
|
if (oldUnit != null) |
|
|
|
if (oldUnit != null) |
|
|
|
return new ParseInformation(oldUnit); |
|
|
|
return oldUnit; |
|
|
|
} |
|
|
|
} |
|
|
|
return this.parseInfo; |
|
|
|
return this.mainParseInfo; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ParseInformation newParseInfo = new ParseInformation(resultUnit); |
|
|
|
IParsedFile newParseInfo = resultUnit; |
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < newUnits.Length; i++) { |
|
|
|
for (int i = 0; i < newUnits.Length; i++) { |
|
|
|
IProjectContent pc = projectContents[i]; |
|
|
|
IProjectContent pc = projectContents[i]; |
|
|
|
// update the compilation unit
|
|
|
|
// update the compilation unit
|
|
|
|
ICompilationUnit oldUnit = oldUnits.FirstOrDefault(o => o.ProjectContent == pc); |
|
|
|
IParsedFile oldUnit = oldUnits.FirstOrDefault(o => o.ProjectContent == pc); |
|
|
|
pc.UpdateCompilationUnit(oldUnit, newUnits[i], fileName); |
|
|
|
pc.UpdateCompilationUnit(oldUnit, newUnits[i], fileName); |
|
|
|
ParseInformation newUnitParseInfo = (newUnits[i] == resultUnit) ? newParseInfo : new ParseInformation(newUnits[i]); |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(oldUnit, newUnits[i], newUnits[i] == resultUnit)); |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(fileName, pc, oldUnit, newUnitParseInfo, newUnits[i] == resultUnit)); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// remove all old units that don't exist anymore
|
|
|
|
// remove all old units that don't exist anymore
|
|
|
|
foreach (ICompilationUnit oldUnit in oldUnits) { |
|
|
|
foreach (IParsedFile oldUnit in oldUnits) { |
|
|
|
if (!newUnits.Any(n => n.ProjectContent == oldUnit.ProjectContent)) { |
|
|
|
if (!newUnits.Any(n => n.ProjectContent == oldUnit.ProjectContent)) { |
|
|
|
oldUnit.ProjectContent.RemoveCompilationUnit(oldUnit); |
|
|
|
oldUnit.ProjectContent.RemoveCompilationUnit(oldUnit); |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(fileName, oldUnit.ProjectContent, oldUnit, null, false)); |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(oldUnit, null, false)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.bufferVersion = fileContentVersion; |
|
|
|
this.bufferVersion = fileContentVersion; |
|
|
|
this.oldUnits = newUnits; |
|
|
|
this.oldUnits = newUnits; |
|
|
|
this.parseInfo = newParseInfo; |
|
|
|
this.mainParseInfo = newParseInfo; |
|
|
|
return newParseInfo; |
|
|
|
return newParseInfo; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void Clear() |
|
|
|
public void Clear() |
|
|
|
{ |
|
|
|
{ |
|
|
|
ParseInformation parseInfo; |
|
|
|
IParsedFile parseInfo; |
|
|
|
ICompilationUnit[] oldUnits; |
|
|
|
IParsedFile[] oldUnits; |
|
|
|
lock (this) { |
|
|
|
lock (this) { |
|
|
|
// by setting the disposed flag, we'll cause all running ParseFile() calls to return null and not
|
|
|
|
// by setting the disposed flag, we'll cause all running ParseFile() calls to return null and not
|
|
|
|
// call into the parser anymore, so we can do the remainder of the clean-up work outside the lock
|
|
|
|
// call into the parser anymore, so we can do the remainder of the clean-up work outside the lock
|
|
|
|
this.disposed = true; |
|
|
|
this.disposed = true; |
|
|
|
parseInfo = this.parseInfo; |
|
|
|
parseInfo = this.mainParseInfo; |
|
|
|
oldUnits = this.oldUnits; |
|
|
|
oldUnits = this.oldUnits; |
|
|
|
this.oldUnits = null; |
|
|
|
this.oldUnits = null; |
|
|
|
this.bufferVersion = null; |
|
|
|
this.bufferVersion = null; |
|
|
|
this.parseInfo = null; |
|
|
|
this.mainParseInfo = null; |
|
|
|
} |
|
|
|
} |
|
|
|
foreach (ICompilationUnit oldUnit in oldUnits) { |
|
|
|
foreach (IParsedFile oldUnit in oldUnits) { |
|
|
|
oldUnit.ProjectContent.RemoveCompilationUnit(oldUnit); |
|
|
|
oldUnit.ProjectContent.RemoveCompilationUnit(oldUnit); |
|
|
|
bool isPrimary = parseInfo != null && parseInfo.CompilationUnit == oldUnit; |
|
|
|
bool isPrimary = parseInfo == oldUnit; |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(fileName, oldUnit.ProjectContent, oldUnit, null, isPrimary)); |
|
|
|
RaiseParseInformationUpdated(new ParseInformationEventArgs(oldUnit, null, isPrimary)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
Daniel Grunwald
14 years ago