Skip to content

Add proof of concept, GitHub for Visual Studio integration #1

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

Open
jcansdale wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add proof of concept, GitHub for Visual Studio integration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44a6003
Integration hack to work with GitHub for VS
jcansdale Feb 9, 2017
88a68cc
Update NuGet package to work with VS2015 R3
jcansdale Feb 9, 2017
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
63 changes: 43 additions & 20 deletions PReview/Git/DiffParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
using System.Linq;
using System.Threading.Tasks;
using PReview.Git;
using System.Net;
using System;

namespace PReview
{
public class DiffParser
{
private readonly string _diffFilePath;
private readonly string _solutionDir;

public DiffParser(string solutionDir)
{
_solutionDir = solutionDir;
_diffFilePath = Path.Combine(_solutionDir, "diff.txt");
}

public async Task<Dictionary<string, UnifiedDiff>> ParseAsync()
Expand All @@ -24,38 +24,61 @@ public async Task<Dictionary<string, UnifiedDiff>> ParseAsync()

var unifiedDiffParser = new UnifiedDiffParser(3);

using (var reader = File.OpenText(_diffFilePath))
var reader = FindPatchReader(_solutionDir);
if(reader != null)
{
var n = 0;

string line;
while ((line = await reader.ReadLineAsync()) != null)
using (reader)
{
if (line.StartsWith("diff --git"))
var n = 0;

string line;
while ((line = await reader.ReadLineAsync()) != null)
{
var unifiedDiff = new UnifiedDiff(line);
if (n > 0)
if (line.StartsWith("diff --git"))
{
unifiedDiffs[unifiedDiffs.Count - 1].HunkRanges.AddRange(unifiedDiffParser.Parse(lines));
}
var unifiedDiff = new UnifiedDiff(line);
if (n > 0)
{
unifiedDiffs[unifiedDiffs.Count - 1].HunkRanges.AddRange(unifiedDiffParser.Parse(lines));
}

n++;
n++;

unifiedDiffs.Add(unifiedDiff);
unifiedDiffs.Add(unifiedDiff);

lines.Clear();
lines.Clear();

lines.Add(line);
}
else
{
lines.Add(line);
lines.Add(line);
}
else
{
lines.Add(line);
}
}
}
}

return unifiedDiffs.ToDictionary(diff => _solutionDir.ToLower() + "\\" + diff.NewFile.Replace("/", "\\").ToLower());
}

private static TextReader FindPatchReader(string solutionDir)
{
var diffUrl = (string)AppDomain.CurrentDomain.GetData("PReview.diff.url");
if (diffUrl != null)
{
var webClient = new WebClient();
var stream = webClient.OpenRead(diffUrl);
return new StreamReader(stream);
}

var patchFile = Path.Combine(solutionDir, "diff.txt");
if (File.Exists(patchFile))
{
return File.OpenText(patchFile);
}

return null;
}
}

public class UnifiedDiff
Expand Down
12 changes: 7 additions & 5 deletions PReview/PReview.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.props')" />
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Expand Down Expand Up @@ -98,7 +98,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
</None>
Expand Down Expand Up @@ -297,10 +299,10 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.0.23107\build\Microsoft.VSSDK.BuildTools.targets')" />
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion PReview/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package id="Microsoft.VisualStudio.Threading" version="14.0.50702" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Utilities" version="14.0.23107" targetFramework="net452" />
<package id="Microsoft.VisualStudio.Validation" version="14.0.50702" targetFramework="net452" />
<package id="Microsoft.VSSDK.BuildTools" version="14.0.23107" targetFramework="net452" developmentDependency="true" />
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net452" developmentDependency="true" />
<package id="MvvmLightLibs" version="5.2.0.0" targetFramework="net452" />
<package id="VSSDK.CoreUtility" version="12.0.4" targetFramework="net452" />
<package id="VSSDK.CoreUtility.12" version="12.0.4" targetFramework="net452" />
Expand Down