@@ -56,7 +36,7 @@
JavaScript:
HTML:
-
+
+
+
+
+
+
+
+
+
+
+
+Hard-wrapping Demo
+
+
+Demonstration of
+the hardwrap addon.
+The above editor has its change event hooked up to
+the wrapParagraphsInRange method, so that the paragraphs
+are reflown as you are typing.
+
+
+
+
diff --git a/demo/theme.html b/demo/theme.html
index 504673d865..a6e2b2da09 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -16,6 +16,7 @@
+
@@ -80,6 +81,7 @@
elegant
erlang-dark
lesser-dark
+
mbo
midnight
monokai
neat
diff --git a/doc/compress.html b/doc/compress.html
index a3e3792a18..e01001d2bb 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@
Version:
HEAD
+ 3.19
3.18
3.16
3.15
@@ -89,10 +90,12 @@
diff.js
dtd.js
ecl.js
+ eiffel.js
erlang.js
fortran.js
gfm.js
gas.js
+ gherkin.js
go.js
groovy.js
haml.js
@@ -166,6 +169,7 @@
foldcode.js
foldgutter.js
fullscreen.js
+ hardwrap.js
html-hint.js
indent-fold.js
javascript-hint.js
@@ -189,6 +193,7 @@
search.js
searchcursor.js
show-hint.js
+ sql-hint.js
trailingspace.js
tern.js
xml-fold.js
diff --git a/doc/docs.css b/doc/docs.css
index d1ab21bad9..c56289346c 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -30,6 +30,10 @@ a, a:visited, a:link, .quasilink {
text-decoration: none;
}
+em {
+ padding-right: 2px;
+}
+
.quasilink {
cursor: pointer;
}
diff --git a/doc/manual.html b/doc/manual.html
index 9f516b7e05..e5a000a5c6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -14,9 +14,10 @@
@@ -358,6 +359,11 @@
which causes the cursor to not reach all the way to the bottom
of the line, looks better
+
+
Controls whether, when the context menu is opened with a
+ click outside of the current selection, the cursor is moved to
+ the point of the click. Defaults to true.
+
workTime , workDelay : numberHighlighting is done by a pseudo background-thread that will
work for workTime milliseconds, and then use
@@ -506,6 +512,11 @@
factor). The from and to arguments
give the new start and end of the viewport.
+
"swapDoc" (instance: CodeMirror, oldDoc: Doc)
+
This is signalled when the editor's document is replaced
+ using the swapDoc
+
"gutterClick" (instance: CodeMirror, line: integer, gutter: string, clickEvent: Event)Fires when the editor gutter (the line-number area) is
clicked. Will pass the editor instance as first argument, the
@@ -1373,7 +1384,7 @@ Sizing, scrolling and positioning methods
cm.setSize (width: number|string, height: number|string)Programatically set the size of the editor (overriding the
applicable CSS
- rules ). width and height height
+ rules). width and height
can be either numbers (interpreted as pixels) or CSS units
("100%", for example). You can
pass null for either of them to indicate that that
@@ -1388,14 +1399,16 @@ Sizing, scrolling and positioning methods
clientHeight} object that represents the current scroll
position, the size of the scrollable area, and the size of the
visible area (minus scrollbars).
-
cm.scrollIntoView (pos: {line, ch}|{left, top, right, bottom}, ?margin: number)
-
Scrolls the given element into view. pos may be
- either a {line, ch} position, referring to a given
- character, null, to refer to the cursor, or
- a {left, top, right, bottom} object, in
- editor-local coordinates. The margin parameter is
- optional. When given, it indicates the amount of pixels around
- the given area that should be made visible as well.
+
cm.scrollIntoView (what: {line, ch}|{left, top, right, bottom}|{from, to}|null, ?margin: number)
+
Scrolls the given position into view. what may
+ be null to scroll the cursor into view,
+ a {line, ch} position to scroll a character into
+ view, a {left, top, right, bottom} pixel range (in
+ editor-local coordinates), or a range {from, to}
+ containing either two character positions or two pixel squares.
+ The margin parameter is optional. When given, it
+ indicates the amount of vertical pixels around the given area
+ that should be made visible as well.
cm.cursorCoords (where: boolean|{line, ch}, mode: string) → {left, top, bottom}Returns an {left, top, bottom} object
@@ -1760,7 +1773,7 @@ Static properties
edit/matchtags.jsDefines an option matchTags that, when enabled,
will cause the tags around the cursor to be highlighted (using
- the CodeMirror-matchingbrackets class). Also
+ the CodeMirror-matchingtag class). Also
defines
a command toMatchingTag,
which you can bind a key to in order to jump to the tag mathing
@@ -1775,6 +1788,19 @@ Static properties
The demo has a nice
squiggly underline style for this class.
+
edit/closetag.js
+
Provides utility functions for adding automatic tag closing
+ to XML modes. See
+ the demo .
+
+
edit/continuelist.js
+
Markdown specific. Defines
+ a "newlineAndIndentContinueMarkdownList" command
+ command that can be bound to enter to automatically
+ insert the leading characters for continuing a list. See
+ the Markdown mode
+ demo .
+
Addon for commenting and uncommenting code. Adds three
methods to CodeMirror instances:
@@ -1866,7 +1892,14 @@ Static properties
giving it the class CodeMirror-foldgutter or
something else if you configure the addon to use a different
class, and this addon will show markers next to folded and
- foldable blocks, and handle clicks in this gutter. The option
+ foldable blocks, and handle clicks in this gutter. Note that
+ CSS styles should be applied to make the gutter, and the fold
+ markers within it, visible. A default set of CSS styles are
+ available in:
+
+ addon/fold/foldgutter.css
+ .
+ The option
can be either set to true, or an object containing
the following optional option fields:
@@ -1874,7 +1907,7 @@ Static properties
The CSS class of the gutter. Defaults
to "CodeMirror-foldgutter". You will have to
style this yourself to give it a width (and possibly a
- background).
+ background). See the default gutter style rules above.
indicatorOpen : string | ElementA CSS class or DOM element to be used as the marker for
open, foldable blocks. Defaults
@@ -1900,6 +1933,22 @@ Static properties
for running under
node.js .
+
runmode/colorize.js
+
Provides a convenient way to syntax-highlight code snippets
+ in a webpage. Depends on
+ the runmodeCodeMirror.colorize function that can be called
+ with an array (or other array-ish collection) of DOM nodes that
+ represent the code snippets. By default, it'll get
+ all pre tags. Will read the data-lang
+ attribute of these nodes to figure out their language, and
+ syntax-color their content using the relevant CodeMirror mode
+ (you'll have to load the scripts for the relevant modes
+ yourself). A second argument may be provided to give a default
+ mode, used when no language attribute is found for a node. Used
+ in this manual to highlight example code.
+
mode/overlay.jsMode combinator that can be used to extend a mode with an
'overlay' — a secondary mode is run over the stream, along with
@@ -2066,7 +2115,13 @@ Static properties
and range, which defines how many lines the addon
should scan when completing (defaults to 500).
-
match-highlighter.js
+
hint/sql-hint.js
+
A simple SQL hinter. Defines CodeMirror.hint.sql.
+
+
hint/pig-hint.js
+
A simple hinter for Pig Latin . Defines CodeMirror.hint.pig.
+
+
search/match-highlighter.jsAdds a highlightSelectionMatches option that
can be enabled to highlight all instances of a currently
selected word. Can be set either to true or to an object
@@ -2085,8 +2140,9 @@ Static properties
lint/lint.jsDefines an interface component for showing linting warnings,
with pluggable warning sources
- (see json-lint.jsjavascript-lint.jsjson-lint.jsjavascript-lint.jscss-lint.jslint option that
can be set to a warning source (for
example CodeMirror.lint.javascript), or
@@ -2108,11 +2164,6 @@ Static properties
and adds a background with the class CodeMirror-activeline-background.
is enabled. See the demo .
-
edit/closetag.js
-
Provides utility functions for adding automatic tag closing
- to XML modes. See
- the demo .
-
mode/loadmode.jsDefines a CodeMirror.requireMode(modename,
callback) function that will try to load a given mode and
@@ -2147,6 +2198,39 @@ Static properties
on fullscreen.cssDemo
here .
+
wrap/hardwrap.js
+
Addon to perform hard line wrapping/breaking for paragraphs
+ of text. Adds these methods to editor instances:
+
+ wrapParagraph (?pos: {line, ch}, ?options: object)Wraps the paragraph at the given position.
+ If pos is not given, it defaults to the cursor
+ position.
+ wrapRange (from: {line, ch}, to: {line, ch}, ?options: object)Wraps the given range as one big paragraph.
+ wrapParagraphsInRange (from: {line, ch}, to: {line, ch}, ?options: object)Wrapps the paragraphs in (and overlapping with) the
+ given range individually.
+
+ The following options are recognized:
+
+ paragraphStart , paragraphEnd : RegExpBlank lines are always considered paragraph boundaries.
+ These options can be used to specify a pattern that causes
+ lines to be considered the start or end of a paragraph.
+ column : numberThe column to wrap at. Defaults to 80.
+ wrapOn : RegExpA regular expression that matches only those
+ two-character strings that allow wrapping. By default, the
+ addon wraps on whitespace and after dash characters.
+ killTrailingSpace : booleanWhether trailing space caused by wrapping should be
+ preserved, or deleted. Defaults to true.
+
+ A demo of the addon is available here .
+
+
merge/merge.jsImplements an interface for merging changes, using either a
2-way or a 3-way view. The CodeMirror.MergeView
@@ -2160,6 +2244,18 @@ Static properties
editor in non-editable CodeMirror instances. The merge interface
will highlight changes between the editable document and the
original(s) (demo ).
+
+
tern/tern.js
+
Provides integration with
+ the Tern JavaScript analysis
+ engine, for completion, definition finding, and minor
+ refactoring help. See the demo
+ for a very simple integration. For more involved scenarios, see
+ the comments at the top of
+ the addon and the
+ implementation of the
+ (multi-file) demonstration
+ on the Tern website .
@@ -2173,15 +2269,15 @@
Static properties
advanced modes can also handle indentation for the language.
The mode script should
- call CodeMirror.defineMode to register itself with
- CodeMirror. This function takes two arguments. The first should be
- the name of the mode, for which you should use a lowercase string,
- preferably one that is also the name of the files that define the
- mode (i.e. "xml" is defined in xml.js). The
- second argument should be a function that, given a CodeMirror
- configuration object (the thing passed to
- the CodeMirror function) and an optional mode
- configuration object (as in
+ call CodeMirror.defineMode "xml" is
+ defined in xml.js). The second argument should be a
+ function that, given a CodeMirror configuration object (the thing
+ passed to the CodeMirror function) and an optional
+ mode configuration object (as in
the mode
@@ -2201,30 +2297,43 @@
Static properties
reading a token, and which can be mutated by the tokenizer.
Modes that use a state must define
- a startState method on their mode object. This is a
- function of no arguments that produces a state object to be used
- at the start of a document.
+ a
startState method on their mode
+ object. This is a function of no arguments that produces a state
+ object to be used at the start of a document.
The most important part of a mode object is
- its token(stream, state) method. All modes must
- define this method. It should read one token from the stream it is
- given as an argument, optionally update its state, and return a
- style string, or null for tokens that do not have to
- be styled. For your styles, you are encouraged to use the
- 'standard' names defined in the themes (without
+ its token (stream, state)null for tokens that do
+ not have to be styled. For your styles, you are encouraged to use
+ the 'standard' names defined in the themes (without
the cm- prefix). If that fails, it is also possible
to come up with your own and write your own CSS theme file.
+
A typical token string would
+ be "variable" or "comment". Multiple
+ styles can be returned (separated by spaces), for
+ example "string error" for a thing that looks like a
+ string but is invalid somehow (say, missing its closing quote).
+ When a style is prefixed by "line-"
+ or "line-background-", the style will be applied to
+ the whole line, analogous to what
+ the addLineClass"text" in the simple case, and
+ the "background" element
+ when "line-background-" is prefixed.
+
The stream object that's passed
to token encapsulates a line of code (tokens may
never span lines) and our current position in that line. It has
the following API:
- eol () → booleaneol () → booleanReturns true only if the stream is at the end of the
line.
- sol () → booleansol () → booleanReturns true only if the stream is at the start of the
line.
@@ -2287,9 +2396,10 @@ Static properties
By default, blank lines are simply skipped when
tokenizing a document. For languages that have significant blank
- lines, you can define a blankLine(state) method on
- your mode that will get called whenever a blank line is passed
- over, so that it can update the parser state.
+ lines, you can define
+ a blankLine (state)Because state object are mutated, and CodeMirror
needs to keep valid versions of a state around so that it can
@@ -2299,17 +2409,17 @@
Static properties
which hold arrays get a copy of these arrays (since arrays tend to
be used as mutable stacks). When this is not correct, for example
because a mode mutates non-array properties of its state object, a
- mode object should define a copyState method,
- which is given a state and should return a safe copy of that
- state.
+ mode object should define
+ a copyState If you want your mode to provide smart indentation
(through the indentLineindentAuto
and newlineAndIndent commands, to which keys can be
bound ), you must define
- an indent(state, textAfter) method on your mode
- object.
+ an indent (state, textAfter)The indentation method should inspect the given state object,
and optionally the textAfter string, which contains
@@ -2322,8 +2432,9 @@
Static properties
Static properties
state.
In a nested mode, it is recommended to add an
- extra method, innerMode which, given a state object,
- returns a {state, mode} object with the inner mode
- and its state for the current position. These are used by utility
- scripts such as the tag closer to
- get context information. Use the CodeMirror.innerMode
- helper function to, starting from a mode and a state, recursively
- walk down to the innermost mode and state.
+ extra method, innerMode {state, mode} object with
+ the inner mode and its state for the current position. These are
+ used by utility scripts such as the tag
+ closer to get context information. Use
+ the CodeMirror.innerMode helper function to, starting
+ from a mode and a state, recursively walk down to the innermost
+ mode and state.
To make indentation work properly in a nested parser, it is
advisable to give the startState method of modes that
@@ -2374,25 +2486,25 @@
Static properties
parser do this, for example, to allow JavaScript and CSS code
inside the mixed-mode HTML mode to be properly indented.
- It is possible, and encouraged, to associate your mode, or a
- certain configuration of your mode, with
+
It is possible, and encouraged, to associate
+ your mode, or a certain configuration of your mode, with
a MIME type. For
example, the JavaScript mode associates itself
with text/javascript, and its JSON variant
with application/json. To do this,
- call CodeMirror.defineMIME(mime, modeSpec),
- where modeSpec can be a string or object specifying a
- mode, as in the mode
+ call CodeMirror.defineMIME (mime,
+ modeSpec)modeSpec can be a string or
+ object specifying a mode, as in
+ the modeSometimes, it is useful to add or override mode
object properties from external code.
- The CodeMirror.extendMode can be used to add
- properties to mode objects produced for a specific mode. Its first
- argument is the name of the mode, its second an object that
- specifies the properties that should be added. This is mostly
- useful to add utilities that can later be looked
- up through getMode
+ The CodeMirror.extendMode getMode BlueGriffon (HTML editor)Cargo Collective (creative publishing platform)ClickHelp (technical writing tool)
+
Complete.ly playground Code per Node (Drupal module)Codebug (PHP Xdebug front-end)CodeMirror Eclipse (embed CM in Eclipse)
@@ -45,8 +46,10 @@
Code together (collaborative editing)Codev (collaborative IDE)CodeZample (code snippet sharing)
+
Codio (Web IDE)Collaborative CodeMirror demo (CodeMirror + operational transforms)Community Code Camp (code snippet sharing)
+
compilejava.net (online Java sandbox)CKWNC (UML editor)CSSDeck (CSS showcase)Deck.js integration (slides with editors)
@@ -79,6 +82,7 @@
Jumpseller (online store builder)kl1p (paste service)Light Table (experimental IDE)
+
Liveweave (HTML/CSS/JS scratchpad)Marklight editor (lightweight markup editor)Mergely (interactive diffing)MIHTool (iOS web-app debugging tool)
@@ -91,7 +95,9 @@
ORG (z80 assembly IDE)Orion-CodeMirror integration (running CodeMirror modes in Orion)Paper.js (graphics scripting)
+
PrinBit (collaborative coding tool)Prose.io (github content editor)
+
Puzzlescript (puzzle game engine)ql.io (http API query helper)QiYun web app platform Qt+Webkit integration (building a desktop CodeMirror app)
@@ -113,6 +119,7 @@
uiCod (animation demo gallery and sharing)UmpleOnline (model-oriented programming tool)Upsource (code viewer)
+
webappfind (windows file bindings for webapps)WebGL academy (learning WebGL)WebGL playground WebKit Web inspector
diff --git a/doc/releases.html b/doc/releases.html
index 88996e27a0..f04b4dcad8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,22 @@
Version 3.x
+
21-10-2013: Version 3.19 :
+
+
+
+
23-09-2013: Version 3.18 :
+
+
Emergency release to fix a problem in 3.17
+ where .setOption("lineNumbers", false) would raise an
+ error.
+
23-09-2013: Version 3.17 :
diff --git a/index.html b/index.html
index 6816c1ff82..67771e8bd4 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@
DOWNLOAD LATEST RELEASE
-
+
DONATE WITH PAYPAL
diff --git a/keymap/vim.js b/keymap/vim.js
index 9ad17af31c..e67a46ed7f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -76,8 +76,10 @@
{ keys: ['
'], type: 'keyToKey', toKeys: ['k'] },
{ keys: ['C-['], type: 'keyToKey', toKeys: [''] },
{ keys: [''], type: 'keyToKey', toKeys: [''] },
- { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'] },
- { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'] },
+ { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
+ { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
+ { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
+ { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
{ keys: [''], type: 'keyToKey', toKeys: ['0'] },
{ keys: [''], type: 'keyToKey', toKeys: ['$'] },
{ keys: [''], type: 'keyToKey', toKeys: [''] },
@@ -609,6 +611,9 @@
}
commandDispatcher.processCommand(cm, vim, command);
}
+ },
+ handleEx: function(cm, input) {
+ exCommandDispatcher.processCommand(cm, input);
}
};
@@ -695,6 +700,9 @@
if (linewise && text.charAt(0) == '\n') {
text = text.slice(1) + '\n';
}
+ if(linewise && text.charAt(text.length - 1) !== '\n'){
+ text += '\n';
+ }
// Lowercase and uppercase registers refer to the same register.
// Uppercase just means append.
var register = this.isValidRegister(registerName) ?
@@ -766,44 +774,74 @@
matchCommand: function(key, keyMap, vim) {
var inputState = vim.inputState;
var keys = inputState.keyBuffer.concat(key);
+ var matchedCommands = [];
+ var selectedCharacter;
for (var i = 0; i < keyMap.length; i++) {
var command = keyMap[i];
if (matchKeysPartial(keys, command.keys)) {
- if (keys.length < command.keys.length) {
- // Matches part of a multi-key command. Buffer and wait for next
- // stroke.
- inputState.keyBuffer.push(key);
- return null;
- }
if (inputState.operator && command.type == 'action') {
// Ignore matched action commands after an operator. Operators
// only operate on motions. This check is really for text
// objects since aW, a[ etcs conflicts with a.
continue;
}
- // Matches whole comand. Return the command.
+ // Match commands that take as an argument.
if (command.keys[keys.length - 1] == 'character') {
- inputState.selectedCharacter = keys[keys.length - 1];
- if(inputState.selectedCharacter.length>1){
- switch(inputState.selectedCharacter){
+ selectedCharacter = keys[keys.length - 1];
+ if(selectedCharacter.length>1){
+ switch(selectedCharacter){
case '':
- inputState.selectedCharacter='\n';
+ selectedCharacter='\n';
break;
case '':
- inputState.selectedCharacter=' ';
+ selectedCharacter=' ';
break;
default:
continue;
}
}
}
+ // Add the command to the list of matched commands. Choose the best
+ // command later.
+ matchedCommands.push(command);
+ }
+ }
+
+ // Returns the command if it is a full match, or null if not.
+ function getFullyMatchedCommandOrNull(command) {
+ if (keys.length < command.keys.length) {
+ // Matches part of a multi-key command. Buffer and wait for next
+ // stroke.
+ inputState.keyBuffer.push(key);
+ return null;
+ } else {
+ if (command.keys[keys.length - 1] == 'character') {
+ inputState.selectedCharacter = selectedCharacter;
+ }
+ // Clear the buffer since a full match was found.
inputState.keyBuffer = [];
return command;
}
}
- // Clear the buffer since there are no partial matches.
- inputState.keyBuffer = [];
- return null;
+
+ if (!matchedCommands.length) {
+ // Clear the buffer since there were no matches.
+ inputState.keyBuffer = [];
+ return null;
+ } else if (matchedCommands.length == 1) {
+ return getFullyMatchedCommandOrNull(matchedCommands[0]);
+ } else {
+ // Find the best match in the list of matchedCommands.
+ var context = vim.visualMode ? 'visual' : 'normal';
+ var bestMatch = matchedCommands[0]; // Default to first in the list.
+ for (var i = 0; i < matchedCommands.length; i++) {
+ if (matchedCommands[i].context == context) {
+ bestMatch = matchedCommands[i];
+ break;
+ }
+ }
+ return getFullyMatchedCommandOrNull(bestMatch);
+ }
},
processCommand: function(cm, vim, command) {
vim.inputState.repeatOverride = command.repeatOverride;
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 4e300b2be2..23eaf74d44 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -74,7 +74,6 @@
.cm-s-default .cm-string {color: #a11;}
.cm-s-default .cm-string-2 {color: #f50;}
.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-error {color: #f00;}
.cm-s-default .cm-qualifier {color: #555;}
.cm-s-default .cm-builtin {color: #30a;}
.cm-s-default .cm-bracket {color: #997;}
@@ -91,6 +90,7 @@
.cm-em {font-style: italic;}
.cm-link {text-decoration: underline;}
+.cm-s-default .cm-error {color: #f00;}
.cm-invalidchar {color: #f00;}
div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 97ab9a0cde..563f688a26 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -353,8 +353,10 @@ window.CodeMirror = (function() {
d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
} else d.gutterFiller.style.display = "";
- if (mac_geLion && scrollbarWidth(d.measure) === 0)
+ if (mac_geLion && scrollbarWidth(d.measure) === 0) {
d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
+ d.scrollbarV.style.pointerEvents = d.scrollbarH.style.pointerEvents = "none";
+ }
}
function visibleLines(display, doc, viewPort) {
@@ -935,8 +937,9 @@ window.CodeMirror = (function() {
// smallest indentation, which tends to need the least context to
// parse correctly.
function findStartLine(cm, n, precise) {
- var minindent, minline, doc = cm.doc, maxScan = cm.doc.mode.innerMode ? 1000 : 100;
- for (var search = n, lim = n - maxScan; search > lim; --search) {
+ var minindent, minline, doc = cm.doc;
+ var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+ for (var search = n; search > lim; --search) {
if (search <= doc.first) return doc.first;
var line = getLine(doc, search - 1);
if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
@@ -961,6 +964,7 @@ window.CodeMirror = (function() {
line.stateAfter = save ? copyState(doc.mode, state) : null;
++pos;
});
+ if (precise) doc.frontier = pos;
return state;
}
@@ -1383,7 +1387,8 @@ window.CodeMirror = (function() {
display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = newScrollPos.scrollLeft;
alignHorizontally(cm);
if (op.scrollToPos)
- scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos), op.scrollToPosMargin);
+ scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
+ clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
} else if (newScrollPos) {
scrollCursorIntoView(cm);
}
@@ -2179,7 +2184,11 @@ window.CodeMirror = (function() {
var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
if (!pos || opera) return; // Opera is difficult.
- if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to))
+
+ // Reset the current text selection only if the click is done outside of the selection
+ // and 'resetSelectionOnContextMenu' option is true.
+ var reset = cm.options.resetSelectionOnContextMenu;
+ if (reset && (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)))
operation(cm, setSelection)(cm.doc, pos, pos);
var oldCSS = display.input.style.cssText;
@@ -2630,7 +2639,7 @@ window.CodeMirror = (function() {
// SCROLLING
function scrollCursorIntoView(cm) {
- var coords = scrollPosIntoView(cm, cm.doc.sel.head, cm.options.cursorScrollMargin);
+ var coords = scrollPosIntoView(cm, cm.doc.sel.head, null, cm.options.cursorScrollMargin);
if (!cm.state.focused) return;
var display = cm.display, box = getRect(display.sizer), doScroll = null;
if (coords.top + box.top < 0) doScroll = true;
@@ -2647,11 +2656,15 @@ window.CodeMirror = (function() {
}
}
- function scrollPosIntoView(cm, pos, margin) {
+ function scrollPosIntoView(cm, pos, end, margin) {
if (margin == null) margin = 0;
for (;;) {
var changed = false, coords = cursorCoords(cm, pos);
- var scrollPos = calculateScrollPos(cm, coords.left, coords.top - margin, coords.left, coords.bottom + margin);
+ var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+ var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
+ Math.min(coords.top, endCoords.top) - margin,
+ Math.max(coords.left, endCoords.left),
+ Math.max(coords.bottom, endCoords.bottom) + margin);
var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
if (scrollPos.scrollTop != null) {
setScrollTop(cm, scrollPos.scrollTop);
@@ -3169,17 +3182,23 @@ window.CodeMirror = (function() {
clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
},
- scrollIntoView: operation(null, function(pos, margin) {
- if (typeof pos == "number") pos = Pos(pos, 0);
+ scrollIntoView: operation(null, function(range, margin) {
+ if (range == null) range = {from: this.doc.sel.head, to: null};
+ else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
+ else if (range.from == null) range = {from: range, to: null};
+ if (!range.to) range.to = range.from;
if (!margin) margin = 0;
- var coords = pos;
- if (!pos || pos.line != null) {
- this.curOp.scrollToPos = pos ? clipPos(this.doc, pos) : this.doc.sel.head;
- this.curOp.scrollToPosMargin = margin;
- coords = cursorCoords(this, this.curOp.scrollToPos);
+ var coords = range;
+ if (range.from.line != null) {
+ this.curOp.scrollToPos = {from: range.from, to: range.to, margin: margin};
+ coords = {from: cursorCoords(this, range.from),
+ to: cursorCoords(this, range.to)};
}
- var sPos = calculateScrollPos(this, coords.left, coords.top - margin, coords.right, coords.bottom + margin);
+ var sPos = calculateScrollPos(this, Math.min(coords.from.left, coords.to.left),
+ Math.min(coords.from.top, coords.to.top) - margin,
+ Math.max(coords.from.right, coords.to.right),
+ Math.max(coords.from.bottom, coords.to.bottom) + margin);
updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
}),
@@ -3211,6 +3230,7 @@ window.CodeMirror = (function() {
clearCaches(this);
resetInput(this, true);
updateScrollPos(this, doc.scrollLeft, doc.scrollTop);
+ signalLater(this, "swapDoc", this, old);
return old;
}),
@@ -3285,6 +3305,8 @@ window.CodeMirror = (function() {
option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
option("showCursorWhenSelecting", false, updateSelection, true);
+ option("resetSelectionOnContextMenu", true);
+
option("readOnly", false, function(cm, val) {
if (val == "nocursor") {onBlur(cm); cm.display.input.blur();}
else if (!val) resetInput(cm, true);
@@ -3521,7 +3543,8 @@ window.CodeMirror = (function() {
keyMap.basic = {
"Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
"End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
- "Delete": "delCharAfter", "Backspace": "delCharBefore", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+ "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+ "Tab": "defaultTab", "Shift-Tab": "indentAuto",
"Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
};
// Note that the save and find-related commands aren't defined by
@@ -4461,7 +4484,7 @@ window.CodeMirror = (function() {
return out;
}
return function(builder, text, style, startStyle, endStyle, title) {
- return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle, title);
+ return inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
};
}
@@ -5879,7 +5902,7 @@ window.CodeMirror = (function() {
// THE END
- CodeMirror.version = "3.18.0";
+ CodeMirror.version = "3.19.0";
return CodeMirror;
})();
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index b7203f124b..d29ad2b73a 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -2,347 +2,348 @@
* Link to the project's GitHub page:
* https://github.com/pickhardt/coffeescript-codemirror-mode
*/
-CodeMirror.defineMode('coffeescript', function(conf) {
- var ERRORCLASS = 'error';
-
- function wordRegexp(words) {
- return new RegExp("^((" + words.join(")|(") + "))\\b");
- }
-
- var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\?]");
- var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\},:`=;\\.]');
- var doubleOperators = new RegExp("^((\->)|(\=>)|(\\+\\+)|(\\+\\=)|(\\-\\-)|(\\-\\=)|(\\*\\*)|(\\*\\=)|(\\/\\/)|(\\/\\=)|(==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//))");
- var doubleDelimiters = new RegExp("^((\\.\\.)|(\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
- var tripleDelimiters = new RegExp("^((\\.\\.\\.)|(//=)|(>>=)|(<<=)|(\\*\\*=))");
- var identifiers = new RegExp("^[_A-Za-z$][_A-Za-z$0-9]*");
- var properties = new RegExp("^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*");
-
- var wordOperators = wordRegexp(['and', 'or', 'not',
- 'is', 'isnt', 'in',
- 'instanceof', 'typeof']);
- var indentKeywords = ['for', 'while', 'loop', 'if', 'unless', 'else',
- 'switch', 'try', 'catch', 'finally', 'class'];
- var commonKeywords = ['break', 'by', 'continue', 'debugger', 'delete',
- 'do', 'in', 'of', 'new', 'return', 'then',
- 'this', 'throw', 'when', 'until'];
-
- var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
-
- indentKeywords = wordRegexp(indentKeywords);
-
-
- var stringPrefixes = new RegExp("^('{3}|\"{3}|['\"])");
- var regexPrefixes = new RegExp("^(/{3}|/)");
- var commonConstants = ['Infinity', 'NaN', 'undefined', 'null', 'true', 'false', 'on', 'off', 'yes', 'no'];
- var constants = wordRegexp(commonConstants);
-
- // Tokenizers
- function tokenBase(stream, state) {
- // Handle scope changes
- if (stream.sol()) {
- var scopeOffset = state.scopes[0].offset;
- if (stream.eatSpace()) {
- var lineOffset = stream.indentation();
- if (lineOffset > scopeOffset) {
- return 'indent';
- } else if (lineOffset < scopeOffset) {
- return 'dedent';
- }
- return null;
- } else {
- if (scopeOffset > 0) {
- dedent(stream, state);
- }
- }
+CodeMirror.defineMode("coffeescript", function(conf) {
+ var ERRORCLASS = "error";
+
+ function wordRegexp(words) {
+ return new RegExp("^((" + words.join(")|(") + "))\\b");
+ }
+
+ var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
+ var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
+ var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
+ var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
+
+ var wordOperators = wordRegexp(["and", "or", "not",
+ "is", "isnt", "in",
+ "instanceof", "typeof"]);
+ var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
+ "switch", "try", "catch", "finally", "class"];
+ var commonKeywords = ["break", "by", "continue", "debugger", "delete",
+ "do", "in", "of", "new", "return", "then",
+ "this", "throw", "when", "until"];
+
+ var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
+
+ indentKeywords = wordRegexp(indentKeywords);
+
+
+ var stringPrefixes = /^('{3}|\"{3}|['\"])/;
+ var regexPrefixes = /^(\/{3}|\/)/;
+ var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
+ var constants = wordRegexp(commonConstants);
+
+ // Tokenizers
+ function tokenBase(stream, state) {
+ // Handle scope changes
+ if (stream.sol()) {
+ if (state.scope.align === null) state.scope.align = false;
+ var scopeOffset = state.scope.offset;
+ if (stream.eatSpace()) {
+ var lineOffset = stream.indentation();
+ if (lineOffset > scopeOffset && state.scope.type == "coffee") {
+ return "indent";
+ } else if (lineOffset < scopeOffset) {
+ return "dedent";
}
- if (stream.eatSpace()) {
- return null;
- }
-
- var ch = stream.peek();
-
- // Handle docco title comment (single line)
- if (stream.match("####")) {
- stream.skipToEnd();
- return 'comment';
- }
-
- // Handle multi line comments
- if (stream.match("###")) {
- state.tokenize = longComment;
- return state.tokenize(stream, state);
+ return null;
+ } else {
+ if (scopeOffset > 0) {
+ dedent(stream, state);
}
+ }
+ }
+ if (stream.eatSpace()) {
+ return null;
+ }
- // Single line comment
- if (ch === '#') {
- stream.skipToEnd();
- return 'comment';
- }
+ var ch = stream.peek();
- // Handle number literals
- if (stream.match(/^-?[0-9\.]/, false)) {
- var floatLiteral = false;
- // Floats
- if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
- floatLiteral = true;
- }
- if (stream.match(/^-?\d+\.\d*/)) {
- floatLiteral = true;
- }
- if (stream.match(/^-?\.\d+/)) {
- floatLiteral = true;
- }
-
- if (floatLiteral) {
- // prevent from getting extra . on 1..
- if (stream.peek() == "."){
- stream.backUp(1);
- }
- return 'number';
- }
- // Integers
- var intLiteral = false;
- // Hex
- if (stream.match(/^-?0x[0-9a-f]+/i)) {
- intLiteral = true;
- }
- // Decimal
- if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
- intLiteral = true;
- }
- // Zero by itself with no other piece of number.
- if (stream.match(/^-?0(?![\dx])/i)) {
- intLiteral = true;
- }
- if (intLiteral) {
- return 'number';
- }
- }
+ // Handle docco title comment (single line)
+ if (stream.match("####")) {
+ stream.skipToEnd();
+ return "comment";
+ }
- // Handle strings
- if (stream.match(stringPrefixes)) {
- state.tokenize = tokenFactory(stream.current(), 'string');
- return state.tokenize(stream, state);
- }
- // Handle regex literals
- if (stream.match(regexPrefixes)) {
- if (stream.current() != '/' || stream.match(/^.*\//, false)) { // prevent highlight of division
- state.tokenize = tokenFactory(stream.current(), 'string-2');
- return state.tokenize(stream, state);
- } else {
- stream.backUp(1);
- }
- }
+ // Handle multi line comments
+ if (stream.match("###")) {
+ state.tokenize = longComment;
+ return state.tokenize(stream, state);
+ }
- // Handle operators and delimiters
- if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
- return 'punctuation';
- }
- if (stream.match(doubleOperators)
- || stream.match(singleOperators)
- || stream.match(wordOperators)) {
- return 'operator';
- }
- if (stream.match(singleDelimiters)) {
- return 'punctuation';
- }
+ // Single line comment
+ if (ch === "#") {
+ stream.skipToEnd();
+ return "comment";
+ }
- if (stream.match(constants)) {
- return 'atom';
+ // Handle number literals
+ if (stream.match(/^-?[0-9\.]/, false)) {
+ var floatLiteral = false;
+ // Floats
+ if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
+ floatLiteral = true;
+ }
+ if (stream.match(/^-?\d+\.\d*/)) {
+ floatLiteral = true;
+ }
+ if (stream.match(/^-?\.\d+/)) {
+ floatLiteral = true;
+ }
+
+ if (floatLiteral) {
+ // prevent from getting extra . on 1..
+ if (stream.peek() == "."){
+ stream.backUp(1);
}
+ return "number";
+ }
+ // Integers
+ var intLiteral = false;
+ // Hex
+ if (stream.match(/^-?0x[0-9a-f]+/i)) {
+ intLiteral = true;
+ }
+ // Decimal
+ if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
+ intLiteral = true;
+ }
+ // Zero by itself with no other piece of number.
+ if (stream.match(/^-?0(?![\dx])/i)) {
+ intLiteral = true;
+ }
+ if (intLiteral) {
+ return "number";
+ }
+ }
- if (stream.match(keywords)) {
- return 'keyword';
- }
+ // Handle strings
+ if (stream.match(stringPrefixes)) {
+ state.tokenize = tokenFactory(stream.current(), "string");
+ return state.tokenize(stream, state);
+ }
+ // Handle regex literals
+ if (stream.match(regexPrefixes)) {
+ if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
+ state.tokenize = tokenFactory(stream.current(), "string-2");
+ return state.tokenize(stream, state);
+ } else {
+ stream.backUp(1);
+ }
+ }
- if (stream.match(identifiers)) {
- return 'variable';
- }
+ // Handle operators and delimiters
+ if (stream.match(operators) || stream.match(wordOperators)) {
+ return "operator";
+ }
+ if (stream.match(delimiters)) {
+ return "punctuation";
+ }
- if (stream.match(properties)) {
- return 'property';
- }
+ if (stream.match(constants)) {
+ return "atom";
+ }
- // Handle non-detected items
- stream.next();
- return ERRORCLASS;
+ if (stream.match(keywords)) {
+ return "keyword";
}
- function tokenFactory(delimiter, outclass) {
- var singleline = delimiter.length == 1;
- return function(stream, state) {
- while (!stream.eol()) {
- stream.eatWhile(/[^'"\/\\]/);
- if (stream.eat('\\')) {
- stream.next();
- if (singleline && stream.eol()) {
- return outclass;
- }
- } else if (stream.match(delimiter)) {
- state.tokenize = tokenBase;
- return outclass;
- } else {
- stream.eat(/['"\/]/);
- }
- }
- if (singleline) {
- if (conf.mode.singleLineStringErrors) {
- outclass = ERRORCLASS;
- } else {
- state.tokenize = tokenBase;
- }
- }
- return outclass;
- };
+ if (stream.match(identifiers)) {
+ return "variable";
}
- function longComment(stream, state) {
- while (!stream.eol()) {
- stream.eatWhile(/[^#]/);
- if (stream.match("###")) {
- state.tokenize = tokenBase;
- break;
- }
- stream.eatWhile("#");
- }
- return "comment";
+ if (stream.match(properties)) {
+ return "property";
}
- function indent(stream, state, type) {
- type = type || 'coffee';
- var indentUnit = 0;
- if (type === 'coffee') {
- for (var i = 0; i < state.scopes.length; i++) {
- if (state.scopes[i].type === 'coffee') {
- indentUnit = state.scopes[i].offset + conf.indentUnit;
- break;
- }
- }
+ // Handle non-detected items
+ stream.next();
+ return ERRORCLASS;
+ }
+
+ function tokenFactory(delimiter, outclass) {
+ var singleline = delimiter.length == 1;
+ return function(stream, state) {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^'"\/\\]/);
+ if (stream.eat("\\")) {
+ stream.next();
+ if (singleline && stream.eol()) {
+ return outclass;
+ }
+ } else if (stream.match(delimiter)) {
+ state.tokenize = tokenBase;
+ return outclass;
} else {
- indentUnit = stream.column() + stream.current().length;
+ stream.eat(/['"\/]/);
}
- state.scopes.unshift({
- offset: indentUnit,
- type: type
- });
- }
-
- function dedent(stream, state) {
- if (state.scopes.length == 1) return;
- if (state.scopes[0].type === 'coffee') {
- var _indent = stream.indentation();
- var _indent_index = -1;
- for (var i = 0; i < state.scopes.length; ++i) {
- if (_indent === state.scopes[i].offset) {
- _indent_index = i;
- break;
- }
- }
- if (_indent_index === -1) {
- return true;
- }
- while (state.scopes[0].offset !== _indent) {
- state.scopes.shift();
- }
- return false;
+ }
+ if (singleline) {
+ if (conf.mode.singleLineStringErrors) {
+ outclass = ERRORCLASS;
} else {
- state.scopes.shift();
- return false;
+ state.tokenize = tokenBase;
}
+ }
+ return outclass;
+ };
+ }
+
+ function longComment(stream, state) {
+ while (!stream.eol()) {
+ stream.eatWhile(/[^#]/);
+ if (stream.match("###")) {
+ state.tokenize = tokenBase;
+ break;
+ }
+ stream.eatWhile("#");
}
-
- function tokenLexer(stream, state) {
- var style = state.tokenize(stream, state);
- var current = stream.current();
-
- // Handle '.' connected identifiers
- if (current === '.') {
- style = state.tokenize(stream, state);
- current = stream.current();
- if (/^\.[\w$]+$/.test(current)) {
- return 'variable';
- } else {
- return ERRORCLASS;
- }
- }
-
- // Handle scope changes.
- if (current === 'return') {
- state.dedent += 1;
- }
- if (((current === '->' || current === '=>') &&
- !state.lambda &&
- state.scopes[0].type == 'coffee' &&
- stream.peek() === '')
- || style === 'indent') {
- indent(stream, state);
- }
- var delimiter_index = '[({'.indexOf(current);
- if (delimiter_index !== -1) {
- indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1));
- }
- if (indentKeywords.exec(current)){
- indent(stream, state);
- }
- if (current == 'then'){
- dedent(stream, state);
- }
-
-
- if (style === 'dedent') {
- if (dedent(stream, state)) {
- return ERRORCLASS;
- }
- }
- delimiter_index = '])}'.indexOf(current);
- if (delimiter_index !== -1) {
- if (dedent(stream, state)) {
- return ERRORCLASS;
- }
- }
- if (state.dedent > 0 && stream.eol() && state.scopes[0].type == 'coffee') {
- if (state.scopes.length > 1) state.scopes.shift();
- state.dedent -= 1;
+ return "comment";
+ }
+
+ function indent(stream, state, type) {
+ type = type || "coffee";
+ var offset = 0, align = false, alignOffset = null;
+ for (var scope = state.scope; scope; scope = scope.prev) {
+ if (scope.type === "coffee") {
+ offset = scope.offset + conf.indentUnit;
+ break;
+ }
+ }
+ if (type !== "coffee") {
+ align = null;
+ alignOffset = stream.column() + stream.current().length;
+ }
+ state.scope = {
+ offset: offset,
+ type: type,
+ prev: state.scope,
+ align: align,
+ alignOffset: alignOffset
+ };
+ }
+
+ function dedent(stream, state) {
+ if (!state.scope.prev) return;
+ if (state.scope.type === "coffee") {
+ var _indent = stream.indentation();
+ var matched = false;
+ for (var scope = state.scope; scope; scope = scope.prev) {
+ if (_indent === scope.offset) {
+ matched = true;
+ break;
}
-
- return style;
+ }
+ if (!matched) {
+ return true;
+ }
+ while (state.scope.prev && state.scope.offset !== _indent) {
+ state.scope = state.scope.prev;
+ }
+ return false;
+ } else {
+ state.scope = state.scope.prev;
+ return false;
+ }
+ }
+
+ function tokenLexer(stream, state) {
+ var style = state.tokenize(stream, state);
+ var current = stream.current();
+
+ // Handle "." connected identifiers
+ if (current === ".") {
+ style = state.tokenize(stream, state);
+ current = stream.current();
+ if (/^\.[\w$]+$/.test(current)) {
+ return "variable";
+ } else {
+ return ERRORCLASS;
+ }
}
- var external = {
- startState: function(basecolumn) {
- return {
- tokenize: tokenBase,
- scopes: [{offset:basecolumn || 0, type:'coffee'}],
- lastToken: null,
- lambda: false,
- dedent: 0
- };
- },
-
- token: function(stream, state) {
- var style = tokenLexer(stream, state);
-
- state.lastToken = {style:style, content: stream.current()};
-
- if (stream.eol() && stream.lambda) {
- state.lambda = false;
- }
-
- return style;
- },
+ // Handle scope changes.
+ if (current === "return") {
+ state.dedent += 1;
+ }
+ if (((current === "->" || current === "=>") &&
+ !state.lambda &&
+ state.scope.type == "coffee" &&
+ !stream.peek())
+ || style === "indent") {
+ indent(stream, state);
+ }
+ var delimiter_index = "[({".indexOf(current);
+ if (delimiter_index !== -1) {
+ indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+ }
+ if (indentKeywords.exec(current)){
+ indent(stream, state);
+ }
+ if (current == "then"){
+ dedent(stream, state);
+ }
- indent: function(state) {
- if (state.tokenize != tokenBase) {
- return 0;
- }
- return state.scopes[0].offset;
- },
+ if (style === "dedent") {
+ if (dedent(stream, state)) {
+ return ERRORCLASS;
+ }
+ }
+ delimiter_index = "])}".indexOf(current);
+ if (delimiter_index !== -1) {
+ if (dedent(stream, state)) {
+ return ERRORCLASS;
+ }
+ }
+ if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
+ if (state.scope.prev) state.scope = state.scope.prev;
+ state.dedent -= 1;
+ }
- lineComment: "#",
- fold: "indent"
- };
- return external;
+ return style;
+ }
+
+ var external = {
+ startState: function(basecolumn) {
+ return {
+ tokenize: tokenBase,
+ scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
+ lastToken: null,
+ lambda: false,
+ dedent: 0
+ };
+ },
+
+ token: function(stream, state) {
+ var fillAlign = state.scope.align === null && state.scope;
+ if (fillAlign && stream.sol()) fillAlign.align = false;
+
+ var style = tokenLexer(stream, state);
+ if (fillAlign && style && style != "comment") fillAlign.align = true;
+
+ state.lastToken = {style:style, content: stream.current()};
+
+ if (stream.eol() && stream.lambda) {
+ state.lambda = false;
+ }
+
+ return style;
+ },
+
+ indent: function(state, text) {
+ if (state.tokenize != tokenBase) return 0;
+ var closes = state.scope.type === (text && text.charAt(0));
+ if (state.scope.align)
+ return state.scope.alignOffset - (closes ? 1 : 0);
+ else
+ return (closes ? state.scope.prev : state.scope).offset;
+ },
+
+ lineComment: "#",
+ fold: "indent"
+ };
+ return external;
});
-CodeMirror.defineMIME('text/x-coffeescript', 'coffeescript');
+CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
diff --git a/mode/css/css.js b/mode/css/css.js
index 4264bc606c..f47aba75a1 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -3,7 +3,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
- var indentUnit = config.indentUnit,
+ var indentUnit = config.indentUnit || config.tabSize || 2,
hooks = parserConfig.hooks || {},
atMediaTypes = parserConfig.atMediaTypes || {},
atMediaFeatures = parserConfig.atMediaFeatures || {},
@@ -259,8 +259,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
}
else if (type == "}") {
if (context == "interpolation") style = "operator";
- state.stack.pop();
- if (context == "propertyValue") state.stack.pop();
+ // Pop off end of array until { is reached
+ while(state.stack.length){
+ var removed = state.stack.pop();
+ if(removed.indexOf("{") > -1){
+ break;
+ }
+ }
}
else if (type == "interpolation") state.stack.push("interpolation");
else if (type == "@media") state.stack.push("@media");
@@ -278,11 +283,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
else state.stack.push("(");
}
else if (type == ")") {
- if (context == "propertyValue") {
- // In @mediaType( without closing ; after propertyValue
- state.stack.pop();
+ // Pop off end of array until ( is reached
+ while(state.stack.length){
+ var removed = state.stack.pop();
+ if(removed.indexOf("(") > -1){
+ break;
+ }
}
- state.stack.pop();
}
else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
else if (context == "propertyValue" && type == ";") state.stack.pop();
@@ -602,6 +609,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
}
return ["variable", "variable"];
},
+ ",": function(_stream, state) {
+ if (state.stack[state.stack.length - 1] == "propertyValue") {
+ return ["operator", ";"];
+ }
+ },
"/": function(stream, state) {
if (stream.eat("/")) {
stream.skipToEnd();
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 3644f63de8..bc2a078576 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,6 +1,7 @@
(function() {
- var mode = CodeMirror.getMode({tabSize: 4}, "text/x-scss");
+ var mode = CodeMirror.getMode({tabSize: 1}, "text/x-scss");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
+ function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
MT('url_with_quotation',
"[tag foo] { [property background][operator :][string-2 url]([string test.jpg]) }");
@@ -77,4 +78,7 @@
MT('nested_structure_with_id_selector',
"[tag p] { [builtin #hello] { [property color][operator :][keyword red]; } }");
+
+ IT('mixin',
+ "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
})();
diff --git a/mode/css/test.js b/mode/css/test.js
index 13fc04c1b3..43647833aa 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,6 +1,7 @@
(function() {
- var mode = CodeMirror.getMode({tabSize: 4}, "css");
+ var mode = CodeMirror.getMode({tabSize: 1}, "css");
function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+ function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
// Requires at least one media query
MT("atMediaEmpty",
@@ -123,4 +124,7 @@
MT("commentSGML",
"[comment ]");
+
+ IT("tagSelector",
+ "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
})();
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
new file mode 100644
index 0000000000..15f34a9325
--- /dev/null
+++ b/mode/eiffel/eiffel.js
@@ -0,0 +1,147 @@
+CodeMirror.defineMode("eiffel", function() {
+ function wordObj(words) {
+ var o = {};
+ for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+ return o;
+ }
+ var keywords = wordObj([
+ 'note',
+ 'across',
+ 'when',
+ 'variant',
+ 'until',
+ 'unique',
+ 'undefine',
+ 'then',
+ 'strip',
+ 'select',
+ 'retry',
+ 'rescue',
+ 'require',
+ 'rename',
+ 'reference',
+ 'redefine',
+ 'prefix',
+ 'once',
+ 'old',
+ 'obsolete',
+ 'loop',
+ 'local',
+ 'like',
+ 'is',
+ 'inspect',
+ 'infix',
+ 'include',
+ 'if',
+ 'frozen',
+ 'from',
+ 'external',
+ 'export',
+ 'ensure',
+ 'end',
+ 'elseif',
+ 'else',
+ 'do',
+ 'creation',
+ 'create',
+ 'check',
+ 'alias',
+ 'agent',
+ 'separate',
+ 'invariant',
+ 'inherit',
+ 'indexing',
+ 'feature',
+ 'expanded',
+ 'deferred',
+ 'class',
+ 'Void',
+ 'True',
+ 'Result',
+ 'Precursor',
+ 'False',
+ 'Current',
+ 'create',
+ 'attached',
+ 'detachable',
+ 'as',
+ 'and',
+ 'implies',
+ 'not',
+ 'or'
+ ]);
+ var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
+ var curPunc;
+
+ function chain(newtok, stream, state) {
+ state.tokenize.push(newtok);
+ return newtok(stream, state);
+ }
+
+ function tokenBase(stream, state) {
+ curPunc = null;
+ if (stream.eatSpace()) return null;
+ var ch = stream.next();
+ if (ch == '"'||ch == "'") {
+ return chain(readQuoted(ch, "string"), stream, state);
+ } else if (ch == "-"&&stream.eat("-")) {
+ stream.skipToEnd();
+ return "comment";
+ } else if (ch == ":"&&stream.eat("=")) {
+ return "operator";
+ } else if (/[0-9]/.test(ch)) {
+ stream.eatWhile(/[xXbBCc0-9\.]/);
+ stream.eat(/[\?\!]/);
+ return "ident";
+ } else if (/[a-zA-Z_0-9]/.test(ch)) {
+ stream.eatWhile(/[a-zA-Z_0-9]/);
+ stream.eat(/[\?\!]/);
+ return "ident";
+ } else if (/[=+\-\/*^%<>~]/.test(ch)) {
+ stream.eatWhile(/[=+\-\/*^%<>~]/);
+ return "operator";
+ } else {
+ return null;
+ }
+ }
+
+ function readQuoted(quote, style, unescaped) {
+ return function(stream, state) {
+ var escaped = false, ch;
+ while ((ch = stream.next()) != null) {
+ if (ch == quote && (unescaped || !escaped)) {
+ state.tokenize.pop();
+ break;
+ }
+ escaped = !escaped && ch == "%";
+ }
+ return style;
+ };
+ }
+
+ return {
+ startState: function() {
+ return {tokenize: [tokenBase]};
+ },
+
+ token: function(stream, state) {
+ var style = state.tokenize[state.tokenize.length-1](stream, state);
+ if (style == "ident") {
+ var word = stream.current();
+ style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+ : operators.propertyIsEnumerable(stream.current()) ? "operator"
+ : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
+ : /^0[bB][0-1]+$/g.test(word) ? "number"
+ : /^0[cC][0-7]+$/g.test(word) ? "number"
+ : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
+ : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
+ : /^[0-9]+$/g.test(word) ? "number"
+ : "variable";
+ }
+ return style;
+ },
+ lineComment: "--"
+ };
+});
+
+CodeMirror.defineMIME("text/x-eiffel", "eiffel");
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
new file mode 100644
index 0000000000..5d395a05cd
--- /dev/null
+++ b/mode/eiffel/index.html
@@ -0,0 +1,430 @@
+
+
+CodeMirror: Eiffel mode
+
+
+
+
+
+
+Eiffel mode
+
+
+
+ MIME types defined: text/x-eiffel.
+
+ Created by YNH .
+
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 1179b53dc6..1411a9382a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -75,7 +75,8 @@ CodeMirror.defineMode("gfm", function(config) {
return "link";
}
}
- if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
+ if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+ stream.string.slice(stream.start - 2, stream.start) != "](") {
// URLs
// Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
// And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
new file mode 100644
index 0000000000..dadb58362b
--- /dev/null
+++ b/mode/gherkin/gherkin.js
@@ -0,0 +1,168 @@
+/*
+Gherkin mode - http://www.cukes.info/
+Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+*/
+
+// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
+//var Quotes = {
+// SINGLE: 1,
+// DOUBLE: 2
+//};
+
+//var regex = {
+// keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
+//};
+
+CodeMirror.defineMode("gherkin", function () {
+ return {
+ startState: function () {
+ return {
+ lineNumber: 0,
+ tableHeaderLine: null,
+ allowFeature: true,
+ allowBackground: false,
+ allowScenario: false,
+ allowSteps: false,
+ allowPlaceholders: false,
+ inMultilineArgument: false,
+ inMultilineString: false,
+ inMultilineTable: false
+ };
+ },
+ token: function (stream, state) {
+ if (stream.sol()) {
+ state.lineNumber++;
+ }
+ stream.eatSpace();
+
+ // INSIDE OF MULTILINE ARGUMENTS
+ if (state.inMultilineArgument) {
+
+ // STRING
+ if (state.inMultilineString) {
+ if (stream.match('"""')) {
+ state.inMultilineString = false;
+ state.inMultilineArgument = false;
+ } else {
+ stream.match(/.*/);
+ }
+ return "string";
+ }
+
+ // TABLE
+ if (state.inMultilineTable) {
+ // New table, assume first row is headers
+ if (state.tableHeaderLine === null) {
+ state.tableHeaderLine = state.lineNumber;
+ }
+
+ if (stream.match(/\|\s*/)) {
+ if (stream.eol()) {
+ state.inMultilineTable = false;
+ }
+ return "bracket";
+ } else {
+ stream.match(/[^\|]*/);
+ return state.tableHeaderLine === state.lineNumber ? "property" : "string";
+ }
+ }
+
+ // DETECT START
+ if (stream.match('"""')) {
+ // String
+ state.inMultilineString = true;
+ return "string";
+ } else if (stream.match("|")) {
+ // Table
+ state.inMultilineTable = true;
+ return "bracket";
+ } else {
+ // Or abort
+ state.inMultilineArgument = false;
+ state.tableHeaderLine = null;
+ }
+
+
+ return null;
+ }
+
+ // LINE COMMENT
+ if (stream.match(/#.*/)) {
+ return "comment";
+
+ // TAG
+ } else if (stream.match(/@\S+/)) {
+ return "def";
+
+ // FEATURE
+ } else if (state.allowFeature && stream.match(/Feature:/)) {
+ state.allowScenario = true;
+ state.allowBackground = true;
+ state.allowPlaceholders = false;
+ state.allowSteps = false;
+ return "keyword";
+
+ // BACKGROUND
+ } else if (state.allowBackground && stream.match("Background:")) {
+ state.allowPlaceholders = false;
+ state.allowSteps = true;
+ state.allowBackground = false;
+ return "keyword";
+
+ // SCENARIO OUTLINE
+ } else if (state.allowScenario && stream.match("Scenario Outline:")) {
+ state.allowPlaceholders = true;
+ state.allowSteps = true;
+ return "keyword";
+
+ // EXAMPLES
+ } else if (state.allowScenario && stream.match("Examples:")) {
+ state.allowPlaceholders = false;
+ state.allowSteps = true;
+ state.allowBackground = false;
+ state.inMultilineArgument = true;
+ return "keyword";
+
+ // SCENARIO
+ } else if (state.allowScenario && stream.match(/Scenario:/)) {
+ state.allowPlaceholders = false;
+ state.allowSteps = true;
+ state.allowBackground = false;
+ return "keyword";
+
+ // STEPS
+ } else if (state.allowSteps && stream.match(/(Given|When|Then|And|But)/)) {
+ return "keyword";
+
+ // INLINE STRING
+ } else if (!state.inMultilineArgument && stream.match(/"/)) {
+ stream.match(/.*?"/);
+ return "string";
+
+ // MULTILINE ARGUMENTS
+ } else if (state.allowSteps && stream.eat(":")) {
+ if (stream.match(/\s*$/)) {
+ state.inMultilineArgument = true;
+ return "keyword";
+ } else {
+ return null;
+ }
+
+ } else if (state.allowSteps && stream.match("<")) {
+ if (stream.match(/.*?>/)) {
+ return "property";
+ } else {
+ return null;
+ }
+
+ // Fall through
+ } else {
+ stream.eatWhile(/[^":<]/);
+ }
+
+ return null;
+ }
+ };
+});
+
+CodeMirror.defineMIME("text/x-feature", "gherkin");
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
new file mode 100644
index 0000000000..b76877acd6
--- /dev/null
+++ b/mode/gherkin/index.html
@@ -0,0 +1,48 @@
+
+
+CodeMirror: Gherkin mode
+
+
+
+
+
+
+Gherkin mode
+
+
+
+ MIME types defined: text/x-feature.
+
+
diff --git a/mode/index.html b/mode/index.html
index 063e69b6c7..cbdef24f09 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -43,9 +43,11 @@
diff DTD ECL Eiffel Erlang Fortran Gas (AT&T-style assembly)Gherkin Go Groovy HAML {$title|htmlspecialchars|truncate:30}
-
+
{* Multiline smarty
* comment, no {$variables} here
*}
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
old mode 100644
new mode 100755
index c5d008885a..a033ab04fa
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -58,7 +58,12 @@ CodeMirror.defineMode("smartymixed", function(config) {
parsers = {
html: function(stream, state) {
- if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false)) {
+ if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
+ state.tokenize = parsers.smarty;
+ state.localMode = smartyMode;
+ state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
+ return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
+ } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) {
state.tokenize = parsers.smarty;
state.localMode = smartyMode;
state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 0dbdb6722c..e6882d79c1 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -51,7 +51,8 @@
text/x-mysql text/x-mariadb text/x-cassandra text/x-plsql text/x-plsql text/x-mssql
@@ -56,7 +36,7 @@