Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub/fix programmatic rename #6179

Merged
merged 13 commits into from
May 26, 2020
Merged

GitHub/fix programmatic rename #6179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f168e1f
Update Roslyn Nuget packages to use a new APIs
ocalles May 11, 2020
d0011cd
Remove the partial class Renamer that implements IFileRenameHandler
ocalles May 11, 2020
9ba629a
Code cleanup and fix warnings
ocalles May 11, 2020
2615d3d
Code cleanup
ocalles May 21, 2020
e7ce61c
Remove package references to right layer
davkean May 21, 2020
2e33d29
Fix new warning messages detected by the updated package version of A…
ocalles May 22, 2020
63b56b3
Fix file rename bugs
ocalles May 22, 2020
b318055
Fix file rename should not rename types when invalid characters.
ocalles May 22, 2020
108dc57
Code cleanup unit test for file renames.
ocalles May 22, 2020
45f91a8
Check special characters before file rename
ocalles May 22, 2020
9ecd19c
Change position of CPSRenameAsync() to always call it.
ocalles May 22, 2020
f05ae54
Code cleanup
ocalles May 22, 2020
1a24a92
Refactor to extract methods from RenameAsync
ocalles May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@
<Private>false</Private>
</ProjectReference>
</ItemDefinitionGroup>

</Project>
4 changes: 4 additions & 0 deletions build/import/HostAgnostic.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@
<PackageReference Include="Microsoft.VisualStudio.Validation" />
<PackageReference Include="Microsoft.VisualStudio.Threading" />
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Analyzers" />

<!-- VS MEF -->
<PackageReference Include="Microsoft.VisualStudio.Composition" />

<!-- Roslyn -->
<PackageReference Include="Microsoft.VisualStudio.LanguageServices" />
<PackageReference Include="Microsoft.CodeAnalysis" />
<PackageReference Include="Microsoft.CSharp" />

<!-- Analyzers-->
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
Expand Down
7 changes: 4 additions & 3 deletions build/import/Packages.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!-- VS SDK -->
<PackageReference Update="Microsoft.VSSDK.BuildTools" Version="16.7.2" />
<PackageReference Update="Microsoft.VisualStudio.ComponentModelHost" Version="16.0.198-g52de9c2988"/>
<PackageReference Update="Microsoft.VisualStudio.Composition" Version="16.1.8"/>
<PackageReference Update="Microsoft.VisualStudio.Composition" Version="16.4.11"/>
<PackageReference Update="Microsoft.VisualStudio.Data.Core" Version="9.0.21022" />
<PackageReference Update="Microsoft.VisualStudio.DataDesign.Common" Version="16.0.28321-alpha"/>
<PackageReference Update="Microsoft.VisualStudio.Data.Services" Version="9.0.21022" />
Expand Down Expand Up @@ -99,9 +99,10 @@
<PackageReference Update="Microsoft.VisualStudio.ProjectSystem.Analyzers" Version="16.7.232-pre" />

<!-- Roslyn -->
<PackageReference Update="Microsoft.VisualStudio.LanguageServices" Version="3.2.0-beta4-19359-03" />
<PackageReference Update="Microsoft.CodeAnalysis" Version="3.2.0-beta4-19359-03" />
<PackageReference Update="Microsoft.VisualStudio.LanguageServices" Version="3.7.0-2.20256.8" />
<PackageReference Update="Microsoft.CodeAnalysis" Version="3.7.0-2.20256.8" />
<PackageReference Update="Microsoft.VisualStudio.IntegrationTest.Utilities" Version="2.6.0-beta1-62113-02" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />

<!-- Analyzers -->
<!-- Note: analyzers from github.com/dotnet/roslyn-analyzers are built together and share the same version -->
Expand Down
2 changes: 1 addition & 1 deletion build/import/VisualStudio.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<PackageReference Include="Microsoft.VisualStudio.Telemetry" />
<PackageReference Include="Microsoft.VisualStudio.Utilities" />
<PackageReference Include="NuGet.SolutionRestoreManager.Interop" />
<PackageReference Include="NuGet.VisualStudio" />
<PackageReference Include="NuGet.VisualStudio" />
</ItemGroup>

<!--
Expand Down
1 change: 0 additions & 1 deletion build/import/Workarounds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@
<FileWrites Include="$(IntermediateOutputPath)$(TargetName).latest.pkgdef" Condition="Exists('$(IntermediateOutputPath)$(TargetName).latest.pkgdef')"/>
</ItemGroup>
</Target>

</Project>
1 change: 0 additions & 1 deletion ...ystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@
<Target Name="Build" DependsOnTargets="ResolveProjectReferences">
<MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.VisualStudio.Editors/PropPages/ReferencePropPage.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages
Return True
End If

If typeMember.ContainingAssembly.Equals(compilation.Assembly) OrElse typeMember.ContainingAssembly.GivesAccessTo(compilation.Assembly) Then
If SymbolEqualityComparer.Default.Equals(typeMember.ContainingAssembly, compilation.Assembly) OrElse typeMember.ContainingAssembly.GivesAccessTo(compilation.Assembly) Then
Return True
End If
End If
Expand Down
6 changes: 3 additions & 3 deletions ...Studio.ProjectSystem.Managed.VS/ProjectSystem/VS/Properties/StartupObjectsEnumProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public StartupObjectsEnumGenerator(Workspace workspace, UnconfiguredProject proj
public async Task<ICollection<IEnumValue>> GetListedValuesAsync()
{
Project project = _workspace.CurrentSolution.Projects.First(p => PathHelper.IsSamePath(p.FilePath, _unconfiguredProject.FullPath));
Compilation compilation = await project.GetCompilationAsync();
Compilation? compilation = await project.GetCompilationAsync();

IEntryPointFinderService entryPointFinderService = project.LanguageServices.GetService<IEntryPointFinderService>();
IEnumerable<INamedTypeSymbol> entryPoints = entryPointFinderService.FindEntryPoints(compilation.GlobalNamespace, SearchForEntryPointsInFormsOnly);
IEntryPointFinderService? entryPointFinderService = project.LanguageServices.GetService<IEntryPointFinderService>();
IEnumerable<INamedTypeSymbol>? entryPoints = entryPointFinderService?.FindEntryPoints(compilation?.GlobalNamespace, SearchForEntryPointsInFormsOnly);
IEnumerable<string> entryPointNames = entryPoints.Select(e => e.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)));

return entryPointNames.Select(name => (IEnumValue)new PageEnumValue(new EnumValue { Name = name, DisplayName = name })).ToArray();
Expand Down
2 changes: 1 addition & 1 deletion ....VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Rename/Renamer.UndoTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Microsoft.VisualStudio.ProjectSystem.VS.Rename
{
internal sealed partial class Renamer
internal partial class RenamerProjectTreeActionHandler
{
private sealed class UndoScope : IDisposable
{
Expand Down
Loading