diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeWatcher.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeWatcher.cs index d90e34e817dec..9bfa4815c2899 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeWatcher.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/FileChangeWatcher.cs @@ -96,6 +96,7 @@ public interface IContext : IDisposable /// you'll need a file watched (eventually) but it's not worth blocking yet. /// IFileWatchingToken EnqueueWatchingFile(string filePath); + void StopWatchingFile(IFileWatchingToken token); } diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs index f1a5a4ec42a70..0f0955b657f6c 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs @@ -362,7 +362,7 @@ private bool TryGetProjectData(ProjectId projectId, out IVsHierarchy hierarchy, project = null; return - this.TryGetHierarchy(projectId, out hierarchy) && + this.TryGetHierarchy(projectId, out hierarchy) && hierarchy.TryGetProject(out project); } @@ -1040,7 +1040,7 @@ internal override Guid GetProjectGuid(ProjectId projectId) internal override void SetDocumentContext(DocumentId documentId) { _foregroundObject.AssertIsForeground(); - + // Note: this method does not actually call into any workspace code here to change the workspace's context. The assumption is updating the running document table or // IVsHierarchies will raise the appropriate events which we are subscribed to. @@ -1404,7 +1404,7 @@ private void ConvertProjectReferencesToMetadataReferences_NoLock(ProjectId proje if (string.Equals(convertedReference.path, outputPath, StringComparison.OrdinalIgnoreCase) && convertedReference.projectReference.ProjectId == projectId) { - var metadataReference = + var metadataReference = CreateMetadataReference( convertedReference.path, new MetadataReferenceProperties( diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs index 81d962253fe9f..1111a0074d108 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs @@ -59,6 +59,7 @@ internal sealed class ContainedDocument : ForegroundThreadAffinitizedObject, IVi }); private static ConcurrentDictionary s_containedDocuments = new ConcurrentDictionary(); + public static ContainedDocument TryGetContainedDocument(DocumentId id) { ContainedDocument document; diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs index 6a16ae35eda72..b4c11b445d12c 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedLanguage.cs @@ -137,7 +137,7 @@ internal partial class ContainedLanguage // Get the ITextBuffer for the primary buffer Marshal.ThrowExceptionForHR(bufferCoordinator.GetPrimaryBuffer(out var primaryTextLines)); DataBuffer = _editorAdaptersFactoryService.GetDataBuffer((IVsTextBuffer)primaryTextLines); - + // Create our tagger var bufferTagAggregatorFactory = ComponentModel.GetService(); _bufferTagAggregator = bufferTagAggregatorFactory.CreateTagAggregator(SubjectBuffer); diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs index 09714b0b43b57..5c5e0495902fd 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs @@ -428,7 +428,7 @@ private SolutionState AddProject(ProjectId projectId, ProjectState projectState) foreach (var newState in newStateMap) { foreach (var projectReference in newState.Value.ProjectReferences) - { + { if (projectReference.ProjectId == projectId) { newDependencyGraph = newDependencyGraph.WithAdditionalProjectReferences(newState.Key, ImmutableArray.Create(projectId)); @@ -436,7 +436,7 @@ private SolutionState AddProject(ProjectId projectId, ProjectState projectState) } } } - + var newTrackerMap = CreateCompilationTrackerMap(projectId, newDependencyGraph); var newLinkedFilesMap = CreateLinkedFilesMapWithAddedProject(newStateMap[projectId]); @@ -1110,7 +1110,7 @@ public SolutionState AddDocuments(ImmutableArray documentInfos) var newProjectState = oldProject.AddDocuments(newDocumentStatesForProject); - newSolutionState = newSolutionState.ForkProject(newProjectState, + newSolutionState = newSolutionState.ForkProject(newProjectState, CompilationTranslationAction.AddDocuments(newDocumentStatesForProject), newLinkedFilesMap: CreateLinkedFilesMapWithAddedDocuments(newProjectState, documentInfosInProject.Select(d => d.Id))); }