diff --git a/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs b/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs index 9a936ba16b..8864a32a09 100644 --- a/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs +++ b/src/AddIns/Debugger/Debugger.Core/TypeSystemExtensions.cs @@ -436,12 +436,6 @@ namespace Debugger return false; } - public static bool IsKnownType(this IType type, KnownTypeCode knownType) - { - var def = type.GetDefinition(); - return def != null && def.KnownTypeCode == knownType; - } - public static bool IsKnownType(this IType type, Type knownType) { var def = type.GetDefinition(); diff --git a/src/Main/Base/Project/Src/Project/CompilableProject.cs b/src/Main/Base/Project/Src/Project/CompilableProject.cs index 12fcdda68f..bf1eb2865a 100644 --- a/src/Main/Base/Project/Src/Project/CompilableProject.cs +++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs @@ -372,8 +372,16 @@ namespace ICSharpCode.SharpDevelop.Project public override ITypeDefinitionModelCollection TypeDefinitionModels { get { SD.MainThread.VerifyAccess(); - if (typeDefinitionModels == null) + if (typeDefinitionModels == null) { typeDefinitionModels = SD.GetRequiredService().CreateTopLevelTypeDefinitionCollection(new ProjectEntityModelContext(this, ".cs")); + var pc = ProjectContent; + if (pc != null) { + // Add the already loaded files into the model + foreach (var file in pc.Files) { + typeDefinitionModels.Update(null, file); + } + } + } return typeDefinitionModels; } } diff --git a/src/Main/Base/Project/Util/SharpDevelopExtensions.cs b/src/Main/Base/Project/Util/SharpDevelopExtensions.cs index bc2b9a61d6..72882a5af1 100644 --- a/src/Main/Base/Project/Util/SharpDevelopExtensions.cs +++ b/src/Main/Base/Project/Util/SharpDevelopExtensions.cs @@ -465,7 +465,7 @@ namespace ICSharpCode.SharpDevelop } /// - /// Retrieves the model instance the given unresolved entity. + /// Retrieves the model instance for the given unresolved entity. /// /// The unresolved entity /// The project in which the entity is defined.