Fix PR reviews comment snippets (OctoLinker#829)

stefanbuck · web-flow · commit fdc734faefbf · 2020-03-02T19:41:14.000+01:00
diff --git a/e2e/automated.test.js b/e2e/automated.test.js
@@ -72,6 +72,14 @@ describe('End to End tests', () => {
         );
       });
     });
+
+    it('links commentbox', async () => {
+      await executeTest(
+        'https://github.com/OctoLinker/OctoLinker/pull/451/files',
+        'https://nodejs.org/api/path.html',
+        '.highlight-source-js .octolinker-link',
+      );
+    });
   });
 
   describe.skip('expanded blob', () => {
diff --git a/e2e/diff-fixtures.json b/e2e/diff-fixtures.json
@@ -14,5 +14,13 @@
   {
     "url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-b9cfc7f2cdf78a7f4b91a753d10865a2R42",
     "targetUrl": "https://github.com/eslint/eslint"
+  },
+  {
+    "url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-11e9f7f953edc64ba14b0cc350ae7b9dL2",
+    "targetUrl": "https://github.com/webpack-contrib/copy-webpack-plugin"
+  },
+  {
+    "url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-11e9f7f953edc64ba14b0cc350ae7b9dR2",
+    "targetUrl": "https://github.com/webpack-contrib/copy-webpack-plugin"
   }
 ]
diff --git a/packages/blob-reader/helper.js b/packages/blob-reader/helper.js
@@ -5,17 +5,13 @@ function getBlobCodeInner(el) {
 }
 
 function getBlobWrapper(rootElement = document) {
-  let ret = [].slice.call(
-    rootElement.getElementsByClassName('js-blob-wrapper'),
-  );
-
-  if (!ret.length) {
-    ret = [].slice.call(rootElement.getElementsByClassName('blob-wrapper'));
-  }
-
-  if (!ret.length) {
-    ret = [].slice.call(rootElement.getElementsByClassName('highlight'));
-  }
+  const ret = [
+    ...[].slice.call(rootElement.getElementsByClassName('blob-wrapper')),
+    ...[].slice.call(rootElement.getElementsByClassName('js-blob-wrapper')),
+    ...[].slice.call(
+      rootElement.querySelectorAll('[class*="highlight-source-"]'),
+    ),
+  ];
 
   return ret;
 }
@@ -204,7 +200,11 @@ function readLine(el) {
 }
 
 function readLines(el) {
-  if (el.classList.contains('highlight')) {
+  if (
+    el.classList.contains('highlight') &&
+    el.firstElementChild &&
+    el.firstElementChild.nodeName === 'PRE'
+  ) {
     const issueCode = el.getElementsByTagName('pre');
     if (issueCode.length) {
       return issueCode[0].textContent.split(/\n/).map((line, index) => ({

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,13 @@`
`14`	`14`	`{`
`15`	`15`	`"url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-b9cfc7f2cdf78a7f4b91a753d10865a2R42",`
`16`	`16`	`"targetUrl": "https://github.com/eslint/eslint"`
	`17`	`+ },`
	`18`	`+ {`
	`19`	`+ "url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-11e9f7f953edc64ba14b0cc350ae7b9dL2",`
	`20`	`+ "targetUrl": "https://github.com/webpack-contrib/copy-webpack-plugin"`
	`21`	`+ },`
	`22`	`+ {`
	`23`	`+ "url": "https://github.com/OctoLinker/OctoLinker/pull/451/files#diff-11e9f7f953edc64ba14b0cc350ae7b9dR2",`
	`24`	`+ "targetUrl": "https://github.com/webpack-contrib/copy-webpack-plugin"`
`17`	`25`	`}`
`18`	`26`	`]`