Support spaces in .net file paths (#836)

OctoLinker · Apr 12, 2020 · 9ddbd77 · 9ddbd77
1 parent 818ab62
commit 9ddbd77
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/e2e/fixtures/dotnet/classic/Project.csproj b/e2e/fixtures/dotnet/classic/Project.csproj
@@ -38,4 +38,9 @@
     <None Update="..\Directory.Build.props" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- @OctoLinkerResolve(<root>/dotnet/foo bar/test file.cs) -->
+    <Content Include="../foo bar/test file.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/e2e/fixtures/dotnet/foo bar/test file.cs b/e2e/fixtures/dotnet/foo bar/test file.cs
diff --git a/e2e/fixtures/dotnet/sdk/Project.csproj b/e2e/fixtures/dotnet/sdk/Project.csproj
@@ -57,4 +57,9 @@
     <None Update="../Directory.Build.props" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- @OctoLinkerResolve(<root>/dotnet/foo bar/test file.cs) -->
+    <Content Include="../foo bar/test file.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/packages/core/loader.js b/packages/core/loader.js
@@ -71,7 +71,7 @@ function insertLinks({
 
     for (const item of urls) {
       if (item.type === 'internal-link') {
-        if (githubTree.includes(item.path)) {
+        if (githubTree.includes(item.path.replace(/%20/g, ' '))) {
           link.href = item.url;
           if (process.env.OCTOLINKER_LIVE_DEMO) {
             link.href = injectLiveDemoUrl(link.href);

diff --git a/packages/helper-grammar-regex-collection/index.js b/packages/helper-grammar-regex-collection/index.js
@@ -8,6 +8,12 @@ const captureQuotedWord = regex`
   ['"]              # end quote
 `;
 
+const captureSpacedQuotedWord = regex`
+  ['"]              # beginning quote
+  (?<$1>[^'"]+)     # capture the word inside the quotes
+  ['"]              # end quote
+`;
+
 const captureJsQuotedWord = regex`
   ['"\`]            # beginning quote
   (?<$1>[^'"\`\s]+) # capture the word inside the quotes
@@ -220,6 +226,6 @@ export const NET_PROJ_FILE_REFERENCE = regex`
   <(Compile|Content|EmbeddedResource|None|ProjectReference)
   \s+
   .*
-  (Include|Update)=${captureQuotedWord}
+  (Include|Update)=${captureSpacedQuotedWord}
   .*/?>
 `;
diff --git a/packages/helper-grammar-regex-collection/test.js b/packages/helper-grammar-regex-collection/test.js
@@ -489,6 +489,9 @@ const fixtures = {
       ['<Compile Include="foo">', ['foo']],
       ['<Compile Update="foo">', ['foo']],
       ['<Content Include="foo">', ['foo']],
+      ['<Content Include="foo/bar foo">', ['foo/bar foo']],
+      ['<Content Include="foo bar/bar">', ['foo bar/bar']],
+      ['<Content Include="foo bar/bar foo">', ['foo bar/bar foo']],
       ['<Content Update="foo">', ['foo']],
       ['<EmbeddedResource Include="foo">', ['foo']],
       ['<EmbeddedResource Update="foo">', ['foo']],