Fix option detection vatlab/sos-notebook#52

vatlab · Mar 30, 2018 · 63918e1 · 63918e1
1 parent 8700611
commit 63918e1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/codemirror-sos.ts b/src/codemirror-sos.ts
@@ -405,18 +405,20 @@ CodeMirror.defineMode("sos", function(conf: CodeMirror.EditorConfiguration, pars
                     if (stream.peek() == ',') {
                         // move next
                         stream.next();
-                        // , is not the last char, end option line
-                        if (!stream.eol()) {
-                            state.sos_state = null;
-                            state.inner_mode = null;
+                        // , is the last char, continue option line
+                        if (stream.eol()) {
+                            stream.backUp(1);
+                            let it = base_mode.token(stream, state.base_state);
+                            return it ? it + ' sos-option' : null;
                         }
                         stream.backUp(1);
-                        let it = base_mode.token(stream, state.base_state);
-                        return it ? it + ' sos-option' : null;
-                    } else {
-                        let it = base_mode.token(stream, state.base_state);
-                        return it ? it + ' sos-option' : null;
+                    } else if (stream.eol()) {
+                        // end of line stops option mode
+                        state.sos_state = null;
+                        state.inner_mode = null;
                     }
+                    let it = base_mode.token(stream, state.base_state);
+                    return it ? it + ' sos-option' : null;
                 } else if (state.sos_state && state.sos_state.startsWith("start ")) {
                     let sl = stream.peek();
                     let token = base_mode.token(stream, state.base_state);

diff --git a/src/sos-mode.js b/src/sos-mode.js
@@ -411,18 +411,20 @@
                         if (stream.peek() == ',') {
                             // move next
                             stream.next();
-                            // , is not the last char, end option line
-                            if (!stream.eol()) {
-                                state.sos_state = null;
-                                state.inner_mode = null;
+                            // , is the last char, continue option line
+                            if (stream.eol()) {
+                                stream.backUp(1);
+                                let it = base_mode.token(stream, state.base_state);
+                                return it ? it + ' sos-option' : null;
                             }
                             stream.backUp(1);
-                            let it = base_mode.token(stream, state.base_state);
-                            return it ? it + ' sos-option' : null;
-                        } else {
-                            let it = base_mode.token(stream, state.base_state);
-                            return it ? it + ' sos-option' : null;
+                        } else if (stream.eol()) {
+                            // end of line stops option mode
+                            state.sos_state = null;
+                            state.inner_mode = null;
                         }
+                        let it = base_mode.token(stream, state.base_state);
+                        return it ? it + ' sos-option' : null;
                     } else if (state.sos_state && state.sos_state.startsWith("start ")) {
                         let sl = stream.peek();
                         let token = base_mode.token(stream, state.base_state);