fix: markdown editor URL autocompletion (#2452)

Fix for #2062. Using token.string only captured the character at the cursor. Now using the cursor location to determine suitable search text. Also corrected syntax issue where suggestion removed opening link parenthesis.

fix: markdown editor URL autocompletion (#2452)
5a9df24f · James C · GitHub · 352d7c2b · 5a9df24f
Unverified Commit 5a9df24f authored Sep 19, 2020 by James C Committed by GitHub Sep 19, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

editor-markdown.vue client/components/editor/editor-markdown.vue +4 -2

No files found.
--- a/client/components/editor/editor-markdown.vue
+++ b/client/components/editor/editor-markdown.vue
@@ -626,6 +626,8 @@ export default {
          cm.showHint({
            hint: async (cm, options) => {
              const cur = cm.getCursor()
+              const curLine = cm.getLine(cur.line).substring(0, cur.ch)
+              const queryString = curLine.substring(curLine.lastIndexOf('[')+1,curLine.length-2)
              const token = cm.getTokenAt(cur)
              try {
                const respRaw = await this.$apollo.query({
@@ -644,7 +646,7 @@ export default {
                    }
                  `,
                  variables: {
-                    query: token.string,
+                    query: queryString,
                    locale: this.locale
                  },
                  fetchPolicy: 'cache-first'
@@ -653,7 +655,7 @@ export default {
                if (resp && resp.totalHits > 0) {
                  return {
                    list: resp.results.map(r => ({
-                      text: (siteLangs.length > 0 ? `/${r.locale}/${r.path}` : `/${r.path}`) + ')',
+                      text: '(' + (siteLangs.length > 0 ? `/${r.locale}/${r.path}` : `/${r.path}`) + ')',
                      displayText: siteLangs.length > 0 ? `/${r.locale}/${r.path} - ${r.title}` : `/${r.path} - ${r.title}`
                    })),
                    from: CodeMirror.Pos(cur.line, token.start),