Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	addon/lint/lint.js
#	package.json

Author: jackycute

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: main
+on: [push]
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    name: Build and test
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/cache@v2
+        with:
+          path: '/home/runner/work/codemirror/codemirror/node_modules'
+          key: ${{ runner.os }}-modules
+
+      - run: npm install
+
+      - run: npm test

.travis.yml

@@ -77,8 +77,10 @@ Anthony Dugois
 anthonygego
 Anthony Gégo
 Anthony Grimes
+Anthony Stewart
 Anton Kovalyov
 antosarho
+aoki ken
 Apollo Zhu
 AQNOUCH Mohammed
 Aram Shatakhtsyan
@@ -116,6 +118,7 @@ Bernhard Sirlinger
 Bert Chang
 Bharad
 BigBlueHat
+Billiam
 Billy Moon
 Bin Ni
 binny
@@ -226,6 +229,7 @@ Dick Choi
 Diego Fernandez
 dignifiedquire
 Dimage Sapelkin
+Dimitri Mitropoulos
 Dinindu D. Wanniarachchi
 dmaclach
 Dmitry Kiselyov
@@ -416,6 +420,7 @@ jochenberger
 Jochen Berger
 Joel Einbinder
 joelpinheiro
+Joe Predham
 joewalsh
 Johan Ask
 Johannes
@@ -426,13 +431,15 @@ John Engler
 John Lees-Miller
 John Ryan
 John Snelson
+johnspiegel
 John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
 Jonas Helfer
 Jonathan Dierksen
 Jonathan Hart
 Jonathan Malmaud
+Jonathan Rascher
 Jon Gacnik
 jongalloway
 Jon Malmaud
@@ -502,6 +509,7 @@ Leo Baschy
 Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
+lexer2086
 Liam Newman
 Libo Cannici
 Lior Goldberg
@@ -616,6 +624,7 @@ Mike Ivanov
 Mike Kadin
 Mike Kobit
 Milan Szekely
+MinJune Kim
 MinRK
 Miraculix87
 misfo
@@ -630,6 +639,7 @@ ms
 mtaran-google
 Mu-An ✌️ Chiou
 Mu-An Chiou
+Mykola Martynovets
 mzabuawala
 Narciso Jaramillo
 nathanlesage
@@ -718,6 +728,7 @@ Prasanth J
 Prayag Verma
 prendota
 Prendota
+ps173
 Qiang Li
 quiddity-wp
 Radek Piórkowski
@@ -749,16 +760,20 @@ Roberto Abdelkader Martínez Pérez
 robertop23
 Roberto Vidal
 Robert Plummer
+Roman Frolov
 Roman Janusz
+Rongjian Zhang
 Rrandom
 Rrrandom
+Ruslan Bekenev
 Ruslan Osmanov
 rvalavicius
 Ryan Pangrle
 Ryan Petrello
 Ryan Prior
 ryu-sato
 sabaca
+Sachin Gupta
 Sam Lee
 Sam Rawlins
 Samuel Ainsworth
@@ -813,6 +828,7 @@ srajanpaliwal
 Stanislav Oaserele
 stan-z
 Stas Kobzar
+stasoid
 Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
@@ -821,6 +837,7 @@ Stephane Moore
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
+Steven Yung
 Steve O'Hara
 stockiNail
 stoskov
@@ -871,6 +888,7 @@ Tom MacWright
 Tom McLaughlin
 Tony Jian
 tophf
+Torben Bundt
 Torgeir Thoresen
 totalamd
 Travis Heppe
@@ -900,6 +918,7 @@ Wesley Wiser
 Weston Ruter
 Will Binns-Smith
 Will Dean
+Will Hernandez
 William Desportes
 William Jamieson
 William Stein

AUTHORS

@@ -1,3 +1,75 @@
+## 5.63.1 (2021-09-29)
+
+### Bug fixes
+
+Fix an issue with mouse scrolling on Chrome 94 Windows, which made scrolling by wheel move unusably slow.
+
+## 5.63.0 (2021-09-20)
+
+### Bug fixes
+
+Fix scroll position jumping when scrolling a document with very different line heights.
+
+[xml mode](https://codemirror.net/mode/xml/): Look up HTML element behavior in a case-insensitive way.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support guu for case-changing.
+
+## 5.62.3 (2021-08-20)
+
+### Bug fixes
+
+Give the editor a `translate=no` attribute to prevent automatic translation from modifying its content.
+
+Give vim-style cursors a width that matches the character after them.
+
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make buttons keyboard-accessible.
+
+[emacs bindings](https://codemirror.net/demo/emacs.html): Fix by-page scrolling keybindings, which were accidentally inverted.
+
+## 5.62.2 (2021-07-21)
+
+### Bug fixes
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Fix a regression that broke several addon options.
+
+## 5.62.1 (2021-07-20)
+
+### Bug fixes
+
+[vim bindings](https://codemirror.net/demo/vim.html): Make matching of upper-case characters more Unicode-aware.
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Prevent options passed to the addon itself from being given to the linter.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Improve screen reader support.
+
+[search addon](https://codemirror.net/demo/search.html): Avoid using `innerHTML`.
+
+## 5.62.0 (2021-06-21)
+
+### Bug fixes
+
+Improve support for vim-style cursors in a number of themes.
+
+### New features
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Add support for highlighting lines with errors or warnings.
+
+## 5.61.1 (2021-05-20)
+
+### Bug fixes
+
+Fix a bug where changing the editor's document could confuse text-direction management.
+
+Fix a bug in horizontally scrolling the cursor into view.
+
+Optimize adding lots of marks in a single transaction.
+
+[simple mode addon](https://codemirror.net/demo/simplemode.html): Support regexps with a unicode flag.
+
+[javascript mode](https://codemirror.net/mode/javascript/index.html): Add support for TypeScript template string types, improve integration with JSX mode.
+
 ## 5.61.0 (2021-04-20)
 
 ### Bug fixes

CHANGELOG.md

@@ -1,6 +1,6 @@
 # CodeMirror
 
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
+[![Build Status](https://github.com/codemirror/codemirror/workflows/main/badge.svg)](https://github.com/codemirror/codemirror/actions)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for

README.md

@@ -24,9 +24,11 @@
     function getRange(allowFolded) {
       var range = finder(cm, pos);
       if (!range || range.to.line - range.from.line < minSize) return null;
+      if (force === "fold") return range;
+
       var marks = cm.findMarksAt(range.from);
       for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold && force !== "fold") {
+        if (marks[i].__isFold) {
           if (!allowFolded) return null;
           range.cleared = true;
           marks[i].clear();
@@ -99,18 +101,18 @@
     cm.foldCode(cm.getCursor(), null, "fold");
   };
   CodeMirror.commands.unfold = function(cm) {
-    cm.foldCode(cm.getCursor(), null, "unfold");
+    cm.foldCode(cm.getCursor(), { scanUp: false }, "unfold");
   };
   CodeMirror.commands.foldAll = function(cm) {
     cm.operation(function() {
       for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+        cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "fold");
     });
   };
   CodeMirror.commands.unfoldAll = function(cm) {
     cm.operation(function() {
       for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+        cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "unfold");
     });
   };
 

addon/fold/foldcode.js

@@ -224,6 +224,7 @@
   }
 
   function Widget(completion, data) {
+    this.id = "cm-complete-" + Math.floor(Math.random(1e6))
     this.completion = completion;
     this.data = data;
     this.picked = false;
@@ -232,6 +233,9 @@
     var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;
 
     var hints = this.hints = ownerDocument.createElement("ul");
+    hints.setAttribute("role", "listbox")
+    hints.setAttribute("aria-expanded", "true")
+    hints.id = this.id
     var theme = completion.cm.options.theme;
     hints.className = "CodeMirror-hints " + theme;
     this.selectedHint = data.selectedHint || 0;
@@ -242,6 +246,9 @@
       var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
+      if (i == this.selectedHint) elt.setAttribute("aria-selected", "true")
+      elt.id = this.id + "-" + i
+      elt.setAttribute("role", "option")
       if (cur.render) cur.render(elt, data, cur);
       else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));
       elt.hintId = i;
@@ -267,6 +274,9 @@
     var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
     var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
     container.appendChild(hints);
+    cm.getInputField().setAttribute("aria-autocomplete", "list")
+    cm.getInputField().setAttribute("aria-owns", this.id)
+    cm.getInputField().setAttribute("aria-activedescendant", this.id + "-" + this.selectedHint)
 
     var box = completion.options.moveOnOverlap ? hints.getBoundingClientRect() : new DOMRect();
     var scrolls = completion.options.paddingForScrollbar ? hints.scrollHeight > hints.clientHeight + 1 : false;
@@ -364,6 +374,9 @@
       this.completion.widget = null;
       if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints);
       this.completion.cm.removeKeyMap(this.keyMap);
+      var input = this.completion.cm.getInputField()
+      input.removeAttribute("aria-activedescendant")
+      input.removeAttribute("aria-owns")
 
       var cm = this.completion.cm;
       if (this.completion.options.closeOnUnfocus) {
@@ -391,9 +404,14 @@
         i = avoidWrap ? 0  : this.data.list.length - 1;
       if (this.selectedHint == i) return;
       var node = this.hints.childNodes[this.selectedHint];
-      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      if (node) {
+        node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+        node.removeAttribute("aria-selected")
+      }
       node = this.hints.childNodes[this.selectedHint = i];
       node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      node.setAttribute("aria-selected", "true")
+      this.completion.cm.getInputField().setAttribute("aria-activedescendant", node.id)
       this.scrollToActive()
       CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
     },

addon/hint/show-hint.js

@@ -69,3 +69,11 @@
   background-position: right bottom;
   width: 100%; height: 100%;
 }
+
+.CodeMirror-lint-line-error {
+  background-color: rgba(183, 76, 81, 0.08);
+}
+
+.CodeMirror-lint-line-warning {
+  background-color: rgba(255, 211, 0, 0.1);
+}