yard 0.9.40 → 0.9.42

data/lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js

@@ -1,208 +1,203 @@
-(function() {
-  function query(selector, root) {
-    return (root || document).querySelector(selector);
-  }
-
-  function ready(callback) {
-    if (document.readyState === "loading") {
-      document.addEventListener("DOMContentLoaded", callback, { once: true });
-    } else {
-      callback();
-    }
-  }
-
-  function createAutocomplete(input) {
-    var form = input.form;
-    var results = document.createElement("div");
-    var list = document.createElement("ul");
-    var requestTimer = null;
-    var controller = null;
-    var items = [];
-    var activeIndex = -1;
-    var blurTimer = null;
-
-    if (!form) return;
-
-    results.className = "ac_results";
-    results.hidden = true;
-    results.setAttribute("role", "listbox");
-    results.id = input.id + "_results";
-    list.setAttribute("role", "presentation");
-    results.appendChild(list);
-    input.setAttribute("autocomplete", "off");
-    input.setAttribute("aria-autocomplete", "list");
-    input.setAttribute("aria-controls", results.id);
-    input.setAttribute("aria-expanded", "false");
-    form.appendChild(results);
-
-    function syncResultsWidth() {
-      results.style.width = input.offsetWidth + "px";
-    }
-
-    function hideResults() {
-      results.hidden = true;
-      input.setAttribute("aria-expanded", "false");
-      input.removeAttribute("aria-activedescendant");
-      activeIndex = -1;
-      items = [];
-      list.innerHTML = "";
-    }
-
-    function setActive(index) {
-      if (!items.length) return;
-      activeIndex = (index + items.length) % items.length;
-      items.forEach(function(item, itemIndex) {
-        item.element.classList.toggle("ac_over", itemIndex === activeIndex);
-      });
-      input.setAttribute("aria-activedescendant", items[activeIndex].element.id);
-    }
-
-    function selectItem(item) {
-      input.value = item.values[1];
-      window.location.href = item.values[3];
-    }
-
-    function renderItems(lines) {
-      syncResultsWidth();
-      list.innerHTML = "";
-      items = lines.map(function(line, index) {
-        var values = line.split(",");
-        var element = document.createElement("li");
-        var label = document.createElement("span");
-        var namespace = document.createElement("small");
-
-        element.id = results.id + "_item_" + index;
-        element.setAttribute("role", "option");
-        element.className = index % 2 === 0 ? "ac_even" : "ac_odd";
-        label.textContent = values[0];
-        element.appendChild(label);
-
-        if (values[1] !== "") {
-          namespace.textContent = "(" + values[1] + ")";
-          element.appendChild(document.createTextNode(" "));
-          element.appendChild(namespace);
-        }
-
-        element.addEventListener("mouseenter", function() {
-          setActive(index);
-        });
-        element.addEventListener("mousedown", function(event) {
-          event.preventDefault();
-          selectItem(items[index]);
-        });
-
-        list.appendChild(element);
-
-        return { element: element, values: values };
-      });
-
-      if (items.length) {
-        results.hidden = false;
-        input.setAttribute("aria-expanded", "true");
-        setActive(0);
-      } else {
-        hideResults();
-      }
-    }
-
-    function fetchResults(term) {
-      if (controller) controller.abort();
-      controller = new AbortController();
-      input.classList.add("ac_loading");
-
-      fetch(
-        form.action +
-          "?q=" +
-          encodeURIComponent(term) +
-          "&_=" +
-          new Date().getTime(),
-        {
-          headers: {
-            "X-Requested-With": "XMLHttpRequest"
-          },
-          signal: controller.signal
-        }
-      )
-        .then(function(response) {
-          return response.text();
-        })
-        .then(function(text) {
-          var lines = text
-            .split("\n")
-            .map(function(line) {
-              return line.trim();
-            })
-            .filter(Boolean);
-
-          renderItems(lines);
-        })
-        .catch(function(error) {
-          if (error.name !== "AbortError") hideResults();
-        })
-        .finally(function() {
-          input.classList.remove("ac_loading");
-        });
-    }
-
-    input.addEventListener("input", function() {
-      clearTimeout(requestTimer);
-      if (blurTimer) clearTimeout(blurTimer);
-
-      if (!input.value.trim()) {
-        hideResults();
-        return;
-      }
-
-      requestTimer = setTimeout(function() {
-        fetchResults(input.value.trim());
-      }, 200);
-    });
-
-    input.addEventListener("keydown", function(event) {
-      if (results.hidden && (event.key === "ArrowDown" || event.key === "ArrowUp")) {
-        if (!input.value.trim()) return;
-        fetchResults(input.value.trim());
-        return;
-      }
-
-      if (event.key === "ArrowDown") {
-        event.preventDefault();
-        setActive(activeIndex + 1);
-      } else if (event.key === "ArrowUp") {
-        event.preventDefault();
-        setActive(activeIndex - 1);
-      } else if (event.key === "Enter") {
-        if (activeIndex >= 0 && items[activeIndex]) {
-          event.preventDefault();
-          selectItem(items[activeIndex]);
-        }
-      } else if (event.key === "Escape") {
-        hideResults();
-      }
-    });
-
-    input.addEventListener("blur", function() {
-      blurTimer = setTimeout(hideResults, 150);
-    });
-
-    input.addEventListener("focus", function() {
-      syncResultsWidth();
-      if (items.length) {
-        results.hidden = false;
-        input.setAttribute("aria-expanded", "true");
-      }
-    });
-
-    document.addEventListener("click", function(event) {
-      if (!form.contains(event.target)) hideResults();
-    });
-
-    window.addEventListener("resize", syncResultsWidth);
-    syncResultsWidth();
-  }
-
-  ready(function() {
-    var input = query("#search_box");
-    if (input) createAutocomplete(input);
-  });
+(() => {
+	function query(selector, root) {
+		return (root || document).querySelector(selector);
+	}
+
+	function ready(callback) {
+		if (document.readyState === "loading") {
+			document.addEventListener("DOMContentLoaded", callback, { once: true });
+		} else {
+			callback();
+		}
+	}
+
+	function createAutocomplete(input) {
+		const form = input.form;
+		const results = document.createElement("div");
+		const list = document.createElement("ul");
+		let requestTimer = null;
+		let controller = null;
+		let items = [];
+		let activeIndex = -1;
+		let blurTimer = null;
+
+		if (!form) return;
+
+		results.className = "ac_results";
+		results.hidden = true;
+		results.setAttribute("role", "listbox");
+		results.id = `${input.id}_results`;
+		list.setAttribute("role", "presentation");
+		results.appendChild(list);
+		input.setAttribute("autocomplete", "off");
+		input.setAttribute("aria-autocomplete", "list");
+		input.setAttribute("aria-controls", results.id);
+		input.setAttribute("aria-expanded", "false");
+		form.appendChild(results);
+
+		function syncResultsWidth() {
+			results.style.width = `${input.offsetWidth}px`;
+		}
+
+		function hideResults() {
+			results.hidden = true;
+			input.setAttribute("aria-expanded", "false");
+			input.removeAttribute("aria-activedescendant");
+			activeIndex = -1;
+			items = [];
+			list.innerHTML = "";
+		}
+
+		function setActive(index) {
+			if (!items.length) return;
+			activeIndex = (index + items.length) % items.length;
+			items.forEach((item, itemIndex) => {
+				item.element.classList.toggle("ac_over", itemIndex === activeIndex);
+			});
+			input.setAttribute(
+				"aria-activedescendant",
+				items[activeIndex].element.id,
+			);
+		}
+
+		function selectItem(item) {
+			input.value = item.values[1];
+			window.location.href = item.values[3];
+		}
+
+		function renderItems(lines) {
+			syncResultsWidth();
+			list.innerHTML = "";
+			items = lines.map((line, index) => {
+				const values = line.split(",");
+				const element = document.createElement("li");
+				const label = document.createElement("span");
+				const namespace = document.createElement("small");
+
+				element.id = `${results.id}_item_${index}`;
+				element.setAttribute("role", "option");
+				element.className = index % 2 === 0 ? "ac_even" : "ac_odd";
+				label.textContent = values[0];
+				element.appendChild(label);
+
+				if (values[1] !== "") {
+					namespace.textContent = `(${values[1]})`;
+					element.appendChild(document.createTextNode(" "));
+					element.appendChild(namespace);
+				}
+
+				element.addEventListener("mouseenter", () => {
+					setActive(index);
+				});
+				element.addEventListener("mousedown", (event) => {
+					event.preventDefault();
+					selectItem(items[index]);
+				});
+
+				list.appendChild(element);
+
+				return { element: element, values: values };
+			});
+
+			if (items.length) {
+				results.hidden = false;
+				input.setAttribute("aria-expanded", "true");
+				setActive(0);
+			} else {
+				hideResults();
+			}
+		}
+
+		function fetchResults(term) {
+			if (controller) controller.abort();
+			controller = new AbortController();
+			input.classList.add("ac_loading");
+
+			fetch(`${form.action}?q=${encodeURIComponent(term)}&_=${Date.now()}`, {
+				headers: {
+					"X-Requested-With": "XMLHttpRequest",
+				},
+				signal: controller.signal,
+			})
+				.then((response) => response.text())
+				.then((text) => {
+					const lines = text
+						.split("\n")
+						.map((line) => line.trim())
+						.filter(Boolean);
+
+					renderItems(lines);
+				})
+				.catch((error) => {
+					if (error.name !== "AbortError") hideResults();
+				})
+				.finally(() => {
+					input.classList.remove("ac_loading");
+				});
+		}
+
+		input.addEventListener("input", () => {
+			clearTimeout(requestTimer);
+			if (blurTimer) clearTimeout(blurTimer);
+
+			if (!input.value.trim()) {
+				hideResults();
+				return;
+			}
+
+			requestTimer = setTimeout(() => {
+				fetchResults(input.value.trim());
+			}, 200);
+		});
+
+		input.addEventListener("keydown", (event) => {
+			if (
+				results.hidden &&
+				(event.key === "ArrowDown" || event.key === "ArrowUp")
+			) {
+				if (!input.value.trim()) return;
+				fetchResults(input.value.trim());
+				return;
+			}
+
+			if (event.key === "ArrowDown") {
+				event.preventDefault();
+				setActive(activeIndex + 1);
+			} else if (event.key === "ArrowUp") {
+				event.preventDefault();
+				setActive(activeIndex - 1);
+			} else if (event.key === "Enter") {
+				if (activeIndex >= 0 && items[activeIndex]) {
+					event.preventDefault();
+					selectItem(items[activeIndex]);
+				}
+			} else if (event.key === "Escape") {
+				hideResults();
+			}
+		});
+
+		input.addEventListener("blur", () => {
+			blurTimer = setTimeout(hideResults, 150);
+		});
+
+		input.addEventListener("focus", () => {
+			syncResultsWidth();
+			if (items.length) {
+				results.hidden = false;
+				input.setAttribute("aria-expanded", "true");
+			}
+		});
+
+		document.addEventListener("click", (event) => {
+			if (!form.contains(event.target)) hideResults();
+		});
+
+		window.addEventListener("resize", syncResultsWidth);
+		syncResultsWidth();
+	}
+
+	ready(() => {
+		const input = query("#search_box");
+		if (input) createAutocomplete(input);
+	});
 })();

data/lib/yard/templates/helpers/markup/hybrid_markdown.rb

@@ -503,6 +503,7 @@ module YARD
             while index < lines.length
               line = lines[index]
               break if blank_line?(line)
+              break if !buffer.empty? && colon_indented_code_block_start?(lines, index)
               break if thematic_break?(line)
               break if parse_setext_heading(lines, index)
               break if parse_heading(line)
@@ -528,6 +529,7 @@ module YARD
             text = protect_code_spans(text, placeholders)
             text = protect_autolinks(text, placeholders)
             text = protect_hard_breaks(text, placeholders)
+            text = protect_rdoc_images(text, placeholders)
             text = protect_inline_images(text, placeholders)
             text = protect_inline_links(text, placeholders)
             text = protect_braced_text_links(text, placeholders)
@@ -634,6 +636,14 @@ module YARD
             text.gsub(/(?:\\|\s{2,})\n/) { store_placeholder(placeholders, "<br />\n") }
           end
 
+          def protect_rdoc_images(text, placeholders)
+            text.gsub(/(^|[ \t\n])rdoc-image:([A-Za-z][A-Za-z0-9+.-]*:\/\/\S+)(?=$|[ \t\n])/) do
+              prefix = Regexp.last_match(1)
+              dest = Regexp.last_match(2)
+              prefix + store_placeholder(placeholders, image_html('', dest))
+            end
+          end
+
           def protect_inline_images(text, placeholders)
             replace_inline_constructs(text, placeholders, '!') do |label, dest, title|
               store_placeholder(placeholders, image_html(
@@ -918,6 +928,7 @@ module YARD
           def indented_code_block_start?(lines, index, previous_block_type = nil)
             return false unless indented_code_start?(lines[index])
             return true if leading_columns(lines[index]) >= 4
+            return true if colon_indented_code_block_start?(lines, index)
             return false if previous_block_type == :list
             return false if html_block_start?(lines[index])
             return false if parse_setext_heading(lines, index)
@@ -925,6 +936,17 @@ module YARD
             !index.zero? && blank_line?(lines[index - 1])
           end
 
+          def colon_indented_code_block_start?(lines, index)
+            return false if index.zero?
+            return false unless leading_columns(lines[index]) >= 2
+            return false if leading_columns(lines[index]) >= 4
+
+            previous_line = lines[index - 1]
+            return false if blank_line?(previous_line)
+
+            previous_line.rstrip.end_with?(':')
+          end
+
           def yard_indented_code_start?(lines, index)
             return false unless leading_columns(lines[index]) >= 2
             return false unless consume_columns(lines[index], 2) =~ /^!!!([\w.+-]+)[ \t]*$/

data/lib/yard/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module YARD
-  VERSION = '0.9.40'
+  VERSION = '0.9.42'
 end

data/templates/default/fulldoc/html/css/common.css

@@ -1 +1 @@
-/* Override this file with custom rules */
+/* Override this file with custom rules */