Added support for "sync namespace" refactoring

build/Packages.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <MSBuildPackageVersion>16.0.461</MSBuildPackageVersion>
     <NuGetPackageVersion>5.0.0</NuGetPackageVersion>
-    <RoslynPackageVersion>3.2.0-beta4-19326-12</RoslynPackageVersion>
+    <RoslynPackageVersion>3.3.0-beta1-19365-07</RoslynPackageVersion>
     <XunitPackageVersion>2.4.0</XunitPackageVersion>
   </PropertyGroup>
 

src/OmniSharp.Abstractions/Configuration.cs

@@ -4,7 +4,7 @@ internal static class Configuration
     {
         public static bool ZeroBasedIndices = false;
 
-        public const string RoslynVersion = "3.2.0.0";
+        public const string RoslynVersion = "3.3.0.0";
         public const string RoslynPublicKeyToken = "31bf3856ad364e35";
 
         public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");

src/OmniSharp.Http.Driver/app.config

@@ -7,15 +7,15 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
             </dependentAssembly>
 
             <dependentAssembly>

src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.ProjectData.cs

@@ -51,6 +51,7 @@ private class ProjectData
             public RuleSet RuleSet { get; }
             public ImmutableDictionary<string, string> ReferenceAliases { get; }
             public bool TreatWarningsAsErrors { get; }
+            public string DefaultNamespace { get; }
 
             private ProjectData()
             {
@@ -85,6 +86,7 @@ private ProjectData(
                 bool signAssembly,
                 string assemblyOriginatorKeyFile,
                 bool treatWarningsAsErrors,
+                string defaultNamespace,
                 RuleSet ruleset)
                 : this()
             {
@@ -114,6 +116,7 @@ private ProjectData(
                 AssemblyOriginatorKeyFile = assemblyOriginatorKeyFile;
                 TreatWarningsAsErrors = treatWarningsAsErrors;
                 RuleSet = ruleset;
+                DefaultNamespace = defaultNamespace;
             }
 
             private ProjectData(
@@ -139,11 +142,12 @@ private ProjectData(
                 ImmutableArray<string> analyzers,
                 ImmutableArray<string> additionalFiles,
                 bool treatWarningsAsErrors,
+                string defaultNamespace,
                 RuleSet ruleset,
                 ImmutableDictionary<string, string> referenceAliases)
                 : this(guid, name, assemblyName, targetPath, outputPath, intermediateOutputPath, projectAssetsFile,
                       configuration, platform, targetFramework, targetFrameworks, outputKind, languageVersion, nullableContextOptions, allowUnsafeCode,
-                      documentationFile, preprocessorSymbolNames, suppressedDiagnosticIds, signAssembly, assemblyOriginatorKeyFile, treatWarningsAsErrors, ruleset)
+                      documentationFile, preprocessorSymbolNames, suppressedDiagnosticIds, signAssembly, assemblyOriginatorKeyFile, treatWarningsAsErrors, defaultNamespace, ruleset)
             {
                 SourceFiles = sourceFiles.EmptyIfDefault();
                 ProjectReferences = projectReferences.EmptyIfDefault();
@@ -165,6 +169,7 @@ public static ProjectData Create(MSB.Evaluation.Project project)
                 var projectAssetsFile = project.GetPropertyValue(PropertyNames.ProjectAssetsFile);
                 var configuration = project.GetPropertyValue(PropertyNames.Configuration);
                 var platform = project.GetPropertyValue(PropertyNames.Platform);
+                var defaultNamespace = project.GetPropertyValue(PropertyNames.RootNamespace);
 
                 var targetFramework = new FrameworkName(project.GetPropertyValue(PropertyNames.TargetFrameworkMoniker));
 
@@ -190,7 +195,7 @@ public static ProjectData Create(MSB.Evaluation.Project project)
                 return new ProjectData(
                     guid, name, assemblyName, targetPath, outputPath, intermediateOutputPath, projectAssetsFile,
                     configuration, platform, targetFramework, targetFrameworks, outputKind, languageVersion, nullableContextOptions, allowUnsafeCode,
-                    documentationFile, preprocessorSymbolNames, suppressedDiagnosticIds, signAssembly, assemblyOriginatorKeyFile, treatWarningsAsErrors, ruleset: null);
+                    documentationFile, preprocessorSymbolNames, suppressedDiagnosticIds, signAssembly, assemblyOriginatorKeyFile, treatWarningsAsErrors, defaultNamespace, ruleset: null);
             }
 
             public static ProjectData Create(MSB.Execution.ProjectInstance projectInstance)
@@ -204,6 +209,7 @@ public static ProjectData Create(MSB.Execution.ProjectInstance projectInstance)
                 var projectAssetsFile = projectInstance.GetPropertyValue(PropertyNames.ProjectAssetsFile);
                 var configuration = projectInstance.GetPropertyValue(PropertyNames.Configuration);
                 var platform = projectInstance.GetPropertyValue(PropertyNames.Platform);
+                var defaultNamespace = projectInstance.GetPropertyValue(PropertyNames.RootNamespace);
 
                 var targetFramework = new FrameworkName(projectInstance.GetPropertyValue(PropertyNames.TargetFrameworkMoniker));
 
@@ -277,7 +283,7 @@ public static ProjectData Create(MSB.Execution.ProjectInstance projectInstance)
                     configuration, platform, targetFramework, targetFrameworks,
                     outputKind, languageVersion, nullableContextOptions, allowUnsafeCode, documentationFile, preprocessorSymbolNames, suppressedDiagnosticIds,
                     signAssembly, assemblyOriginatorKeyFile,
-                    sourceFiles, projectReferences, references.ToImmutable(), packageReferences, analyzers, additionalFiles, treatWarningsAsErrors, ruleset, referenceAliases.ToImmutableDictionary());
+                    sourceFiles, projectReferences, references.ToImmutable(), packageReferences, analyzers, additionalFiles, treatWarningsAsErrors, defaultNamespace, ruleset, referenceAliases.ToImmutableDictionary());
             }
 
             private static RuleSet ResolveRulesetIfAny(MSB.Execution.ProjectInstance projectInstance)

src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs

@@ -53,6 +53,8 @@ internal partial class ProjectFileInfo
         public ImmutableArray<string> AdditionalFiles => _data.AdditionalFiles;
         public ImmutableDictionary<string, string> ReferenceAliases => _data.ReferenceAliases;
         public bool TreatWarningsAsErrors => _data.TreatWarningsAsErrors;
+        public string DefaultNamespace => _data.DefaultNamespace;
+
         public ProjectIdInfo ProjectIdInfo { get; }
 
         private ProjectFileInfo(

src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfoExtensions.cs

@@ -52,7 +52,6 @@ public static CSharpCompilationOptions CreateCompilationOptions(this ProjectFile
         public static ImmutableDictionary<string, ReportDiagnostic> GetDiagnosticOptions(this ProjectFileInfo projectFileInfo)
         {
             var defaultSuppressions = CompilationOptionsHelper.GetDefaultSuppressedDiagnosticOptions(projectFileInfo.SuppressedDiagnosticIds);
-
             var specificRules = projectFileInfo.RuleSet?.SpecificDiagnosticOptions ?? ImmutableDictionary<string, ReportDiagnostic>.Empty;
 
             return specificRules.Concat(defaultSuppressions.Where(x => !specificRules.Keys.Contains(x.Key))).ToImmutableDictionary();
@@ -71,7 +70,7 @@ public static ProjectInfo CreateProjectInfo(this ProjectFileInfo projectFileInfo
                 filePath: projectFileInfo.FilePath,
                 outputFilePath: projectFileInfo.TargetPath,
                 compilationOptions: projectFileInfo.CreateCompilationOptions(),
-                analyzerReferences: analyzerReferences);
+                analyzerReferences: analyzerReferences).WithDefaultNamespace(projectFileInfo.DefaultNamespace);
         }
 
         private static IEnumerable<AnalyzerReference> ResolveAnalyzerReferencesForProject(ProjectFileInfo projectFileInfo, IAnalyzerAssemblyLoader analyzerAssemblyLoader)

src/OmniSharp.MSBuild/ProjectFile/PropertyNames.cs

@@ -29,6 +29,7 @@ internal static class PropertyNames
         public const string ProjectGuid = nameof(ProjectGuid);
         public const string ProjectName = nameof(ProjectName);
         public const string _ResolveReferenceDependencies = nameof(_ResolveReferenceDependencies);
+        public const string RootNamespace = nameof(RootNamespace);
         public const string RoslynTargetsPath = nameof(RoslynTargetsPath);
         public const string SignAssembly = nameof(SignAssembly);
         public const string SkipCompilerExecution = nameof(SkipCompilerExecution);

src/OmniSharp.MSBuild/ProjectManager.cs

@@ -434,14 +434,15 @@ private void UpdateProject(string projectFilePath)
             UpdateParseOptions(project, projectFileInfo.LanguageVersion, projectFileInfo.PreprocessorSymbolNames, !string.IsNullOrWhiteSpace(projectFileInfo.DocumentationFile));
             UpdateProjectReferences(project, projectFileInfo.ProjectReferences);
             UpdateReferences(project, projectFileInfo.ProjectReferences, projectFileInfo.References);
-            UpdateAnalyzerReferences(projectFileInfo, project);
+            UpdateAnalyzerReferences(project, projectFileInfo);
             UpdateAdditionalFiles(project, projectFileInfo.AdditionalFiles);
+            UpdateProjectProperties(project, projectFileInfo);
 
             _workspace.TryPromoteMiscellaneousDocumentsToProject(project);
             _workspace.UpdateDiagnosticOptionsForProject(project.Id, projectFileInfo.GetDiagnosticOptions());
         }
 
-        private void UpdateAnalyzerReferences(ProjectFileInfo projectFileInfo, Project project)
+        private void UpdateAnalyzerReferences(Project project, ProjectFileInfo projectFileInfo)
         {
             var analyzerFileReferences = projectFileInfo.Analyzers
                 .Select(analyzerReferencePath => new AnalyzerFileReference(analyzerReferencePath, _analyzerAssemblyLoader))
@@ -450,6 +451,22 @@ private void UpdateAnalyzerReferences(ProjectFileInfo projectFileInfo, Project p
             _workspace.SetAnalyzerReferences(project.Id, analyzerFileReferences);
         }
 
+        private void UpdateProjectProperties(Project project, ProjectFileInfo projectFileInfo)
+        {
+            if (projectFileInfo.DefaultNamespace != project.DefaultNamespace)
+            {
+                var newSolution = _workspace.CurrentSolution.WithProjectDefaultNamespace(project.Id, projectFileInfo.DefaultNamespace);
+                if (_workspace.TryApplyChanges(newSolution))
+                {
+                    _logger.LogDebug($"Updated default namespace from {project.DefaultNamespace} to {projectFileInfo.DefaultNamespace} on {project.FilePath} project.");
+                }
+                else
+                {
+                    _logger.LogWarning($"Couldn't update default namespace from {project.DefaultNamespace} to {projectFileInfo.DefaultNamespace} on {project.FilePath} project.");
+                }
+            }
+        }
+
         private void UpdateAdditionalFiles(Project project, IList<string> additionalFiles)
         {
             var currentAdditionalDocuments = project.AdditionalDocuments;
@@ -490,7 +507,7 @@ private void UpdateSourceFiles(Project project, IList<string> sourceFiles)
                     continue;
                 }
 
-                _workspace.AddDocument(project.Id, sourceFile);
+                _workspace.AddDocument(project, sourceFile);
             }
 
             // Removing any remaining documents from the project.

src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/RunCodeActionService.cs

@@ -148,7 +148,7 @@ public override async Task<RunCodeActionResponse> Handle(RunCodeActionRequest re
                             }
                         }
 
-                        this.Workspace.AddDocument(documentId, projectChange.ProjectId, newFilePath, newDocument.SourceCodeKind);
+                        this.Workspace.AddDocument(documentId, projectChange.NewProject, newFilePath, newDocument.SourceCodeKind);
                         solution = this.Workspace.CurrentSolution;
                     }
                     else

src/OmniSharp.Roslyn/BufferManager.cs

@@ -151,29 +151,26 @@ private bool TryAddTransientDocument(string fileName, string fileContent)
             }
             else
             {
+                var projectAndDocumentIds = new List<(ProjectId ProjectId, DocumentId DocumentId)>();
                 var sourceText = SourceText.From(fileContent);
-                var documentInfos = new List<DocumentInfo>();
+
                 foreach (var project in projects)
                 {
-                    var id = DocumentId.CreateNewId(project.Id);
-                    var version = VersionStamp.Create();
-                    var documentInfo = DocumentInfo.Create(
-                        id, fileName, filePath: fileName,
-                        loader: TextLoader.From(TextAndVersion.Create(sourceText, version)));
-
-                    documentInfos.Add(documentInfo);
+                    var documentId = DocumentId.CreateNewId(project.Id);
+                    projectAndDocumentIds.Add((project.Id, documentId));
                 }
 
                 lock (_lock)
                 {
-                    var documentIds = documentInfos.Select(document => document.Id);
+                    var documentIds = projectAndDocumentIds.Select(x => x.DocumentId);
                     _transientDocuments[fileName] = documentIds;
                     _transientDocumentIds.UnionWith(documentIds);
                 }
 
-                foreach (var documentInfo in documentInfos)
+                foreach (var projectAndDocumentId in projectAndDocumentIds)
                 {
-                    _workspace.AddDocument(documentInfo);
+                    var version = VersionStamp.Create();
+                    _workspace.AddDocument(projectAndDocumentId.DocumentId, projectAndDocumentId.ProjectId, fileName, TextLoader.From(TextAndVersion.Create(sourceText, version)));
                 }
             }