diff options
author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2017-03-25 02:03:38 +0300 |
---|---|---|
committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2017-03-25 02:03:38 +0300 |
commit | 902a7dc4a162038563b3d27eb51d1b5617d7162f (patch) | |
tree | cbd405643d2bcbad803f2d0583f285257d7671b9 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem | |
parent | dee0a7d612a6becf77fa2fee7266d7270dff10af (diff) |
[Ide] Don't suppress handling of events from Workspace.Apply* changes
The MD workspace still needs to handle these changes, else various
Roslyn/MD tracking collections get out of sync.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs index 801db41873..5e4fcda395 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/MonoDevelopWorkspace.cs @@ -63,7 +63,6 @@ namespace MonoDevelop.Ide.TypeSystem readonly MonoDevelop.Projects.Solution monoDevelopSolution;
object addLock = new object();
bool added;
- bool internalChanges;
public MonoDevelop.Projects.Solution MonoDevelopSolution {
get {
@@ -778,13 +777,8 @@ namespace MonoDevelop.Ide.TypeSystem protected override void ApplyProjectChanges (ProjectChanges projectChanges)
{
- try {
- internalChanges = true;
this.projectChanges = projectChanges;
base.ApplyProjectChanges (projectChanges);
- } finally {
- internalChanges = false;
- }
}
protected override void OnDocumentTextChanged (Document document)
@@ -1252,8 +1246,6 @@ namespace MonoDevelop.Ide.TypeSystem void OnFileAdded (object sender, MonoDevelop.Projects.ProjectFileEventArgs args)
{
try {
- if (internalChanges)
- return;
var project = (MonoDevelop.Projects.Project)sender;
foreach (MonoDevelop.Projects.ProjectFileEventInfo fargs in args) {
var projectFile = fargs.ProjectFile;
@@ -1281,8 +1273,6 @@ namespace MonoDevelop.Ide.TypeSystem void OnFileRemoved (object sender, MonoDevelop.Projects.ProjectFileEventArgs args)
{
try {
- if (internalChanges)
- return;
var project = (MonoDevelop.Projects.Project)sender;
foreach (MonoDevelop.Projects.ProjectFileEventInfo fargs in args) {
var projectId = GetProjectId (project);
@@ -1320,8 +1310,6 @@ namespace MonoDevelop.Ide.TypeSystem void OnFileRenamed (object sender, MonoDevelop.Projects.ProjectFileRenamedEventArgs args)
{
try {
- if (internalChanges)
- return;
var project = (MonoDevelop.Projects.Project)sender;
foreach (MonoDevelop.Projects.ProjectFileRenamedEventInfo fargs in args) {
var projectFile = fargs.ProjectFile;
@@ -1373,8 +1361,6 @@ namespace MonoDevelop.Ide.TypeSystem async void OnProjectModified (object sender, MonoDevelop.Projects.SolutionItemModifiedEventArgs args)
{
try {
- if (internalChanges)
- return;
if (!args.Any (x => x.Hint == "TargetFramework" || x.Hint == "References"))
return;
var project = sender as MonoDevelop.Projects.DotNetProject;
|