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

fix #59 #60

Merged
merged 3 commits into from
Jan 5, 2016
Merged

fix #59 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c820b8e
fix #59
Jan 5, 2016
6a0d136
add markdown-gfm-get-corpus
Jan 5, 2016
63e7ba4
cleanup and add testing
Jan 5, 2016
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
46 changes: 19 additions & 27 deletions markdown-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3274,32 +3274,19 @@ already in `markdown-gfm-recognized-languages' or
(widget-put widget :error (format "Invalid language spec: '%s'" str))
widget)))

(defun markdown-compare-language-strings (str1 str2)
;; note that this keeps the first capitalization of a language used in a
;; buffer
;; this also relies upon the fact that all input strings have been cleaned
;; with `markdown-clean-language-string'
(eq t (compare-strings str1 nil nil str2 nil nil t)))
(defun markdown-gfm-get-corpus ()
"Create corpus of recognized GFM code block languages for the given buffer."
(append markdown-gfm-used-languages
markdown-gfm-additional-languages
markdown-gfm-recognized-languages))

(defun markdown-add-language-if-new (lang)
(let* ((cleaned-lang (markdown-clean-language-string lang))
(find-result
(cl-find cleaned-lang (append markdown-gfm-used-languages
markdown-gfm-additional-languages
markdown-gfm-recognized-languages)
:test #'markdown-compare-language-strings)))
(if find-result (setq markdown-gfm-last-used-language find-result)
;; we have already checked whether it exists in the list using our fuzzy
;; `markdown-compare-language-strings' function, so we can just push
(push cleaned-lang markdown-gfm-used-languages)
(setq markdown-gfm-last-used-language cleaned-lang))))

(defun markdown-parse-gfm-buffer-for-languages (&optional buffer)
(with-current-buffer (or buffer (current-buffer))
(save-excursion
(goto-char (point-min))
(while (re-search-forward markdown-regex-gfm-code-block nil t)
(markdown-add-language-if-new (match-string-no-properties 2))))))
(cl-find cleaned-lang (markdown-gfm-get-corpus)
:test #'equal)))
(setq markdown-gfm-last-used-language cleaned-lang)
(unless find-result (push cleaned-lang markdown-gfm-used-languages))))

(defun markdown-insert-gfm-code-block (&optional lang)
"Insert GFM code block for language LANG.
Expand All @@ -3308,14 +3295,12 @@ region is active, wrap this region with the markup instead. If
the region boundaries are not on empty lines, these are added
automatically in order to have the correct markup."
(interactive
(list (let ((completion-ignore-case t))
(list (let ((completion-ignore-case nil))
(markdown-clean-language-string
(completing-read
(format "Programming language [%s]: "
(or markdown-gfm-last-used-language "none"))
(append markdown-gfm-used-languages
markdown-gfm-additional-languages
markdown-gfm-recognized-languages)
(markdown-gfm-get-corpus)
nil 'confirm nil
'markdown-gfm-language-history
(or markdown-gfm-last-used-language
Expand Down Expand Up @@ -3346,6 +3331,13 @@ automatically in order to have the correct markup."
(markdown-ensure-blank-line-after)
(forward-line -1)))

(defun markdown-gfm-parse-buffer-for-languages (&optional buffer)
(with-current-buffer (or buffer (current-buffer))
(save-excursion
(goto-char (point-min))
(while (re-search-forward markdown-regex-gfm-code-block nil t)
(markdown-add-language-if-new (match-string-no-properties 2))))))


;;; Footnotes ======================================================================

Expand Down Expand Up @@ -5953,7 +5945,7 @@ before regenerating font-lock rules for extensions."
'(gfm-font-lock-keywords))
;; do the initial link fontification
(markdown-fontify-buffer-wiki-links)
(markdown-parse-gfm-buffer-for-languages))
(markdown-gfm-parse-buffer-for-languages))


;;; Live Preview Mode ============================================
Expand Down
12 changes: 6 additions & 6 deletions tests/markdown-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,16 +3155,16 @@ indented the same amount."
(should (string-equal (buffer-string)
"line 1\n\n``` elisp\nline 2\n```\n\nline 3\n"))))

(ert-deftest test-markdown-gfm/parse-gfm-buffer-for-languages ()
(ert-deftest test-markdown-gfm/gfm-parse-buffer-for-languages ()
"Parse buffer for existing languages for `markdown-gfm-used-languages' test."
(markdown-test-string-gfm "``` MADEUP\n\n```\n```LANGUAGES\n\n```\n"
(markdown-parse-gfm-buffer-for-languages)
(should (equal markdown-gfm-used-languages (list "LANGUAGES" "MADEUP")))
(should (equal markdown-gfm-last-used-language "LANGUAGES"))
(markdown-test-string-gfm "``` MADEUP\n\n```\n```LANGUAGES\n\n```\n```MaDeUp\n\n```\n"
(markdown-gfm-parse-buffer-for-languages)
(should (equal markdown-gfm-used-languages (list "MaDeUp" "LANGUAGES" "MADEUP")))
(should (equal markdown-gfm-last-used-language "MaDeUp"))
(goto-char (point-max))
(markdown-insert-gfm-code-block "newlang")
(should (equal markdown-gfm-used-languages
(list "newlang" "LANGUAGES" "MADEUP")))
(list "newlang" "MaDeUp" "LANGUAGES" "MADEUP")))
(should (equal markdown-gfm-last-used-language "newlang"))))

(ert-deftest test-markdown-gfm/code-block-font-lock ()
Expand Down