aboutsummaryrefslogtreecommitdiff
path: root/js/codemirror/lib/overlay.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/codemirror/lib/overlay.js
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/codemirror/lib/overlay.js')
-rw-r--r--js/codemirror/lib/overlay.js51
1 files changed, 0 insertions, 51 deletions
diff --git a/js/codemirror/lib/overlay.js b/js/codemirror/lib/overlay.js
deleted file mode 100644
index c4cdf9fc..00000000
--- a/js/codemirror/lib/overlay.js
+++ /dev/null
@@ -1,51 +0,0 @@
1// Utility function that allows modes to be combined. The mode given
2// as the base argument takes care of most of the normal mode
3// functionality, but a second (typically simple) mode is used, which
4// can override the style of text. Both modes get to parse all of the
5// text, but when both assign a non-null style to a piece of code, the
6// overlay wins, unless the combine argument was true, in which case
7// the styles are combined.
8
9CodeMirror.overlayParser = function(base, overlay, combine) {
10 return {
11 startState: function() {
12 return {
13 base: CodeMirror.startState(base),
14 overlay: CodeMirror.startState(overlay),
15 basePos: 0, baseCur: null,
16 overlayPos: 0, overlayCur: null
17 };
18 },
19 copyState: function(state) {
20 return {
21 base: CodeMirror.copyState(base, state.base),
22 overlay: CodeMirror.copyState(overlay, state.overlay),
23 basePos: state.basePos, baseCur: null,
24 overlayPos: state.overlayPos, overlayCur: null
25 };
26 },
27
28 token: function(stream, state) {
29 if (stream.start == state.basePos) {
30 state.baseCur = base.token(stream, state.base);
31 state.basePos = stream.pos;
32 }
33 if (stream.start == state.overlayPos) {
34 stream.pos = stream.start;
35 state.overlayCur = overlay.token(stream, state.overlay);
36 state.overlayPos = stream.pos;
37 }
38 stream.pos = Math.min(state.basePos, state.overlayPos);
39 if (stream.eol()) state.basePos = state.overlayPos = 0;
40
41 if (state.overlayCur == null) return state.baseCur;
42 if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;
43 else return state.overlayCur;
44 },
45
46 indent: function(state, textAfter) {
47 return base.indent(state.base, textAfter);
48 },
49 electricChars: base.electricChars
50 };
51};