From 6388c8e590f6d5fe7a4fea4cbb2eff71ebc7b970 Mon Sep 17 00:00:00 2001
From: Siddharth Seth <sseth2@illinois.edu>
Date: Fri, 27 Mar 2015 21:56:49 -0500
Subject: [PATCH 1/2] BugFix#67: Fixing Auto-indent

Changes:

* Created a new mode that inherits from ace's c_cpp mode.
* Fixed a regular expression inside the getNextLineIdent to account for strings after an opening bracket.

TODO:

* Figure out how to configure the editor to use a custom mode.

Closes #67
---
 app/scripts/editor/mode-c_cpp_sys.js | 73 ++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 app/scripts/editor/mode-c_cpp_sys.js

diff --git a/app/scripts/editor/mode-c_cpp_sys.js b/app/scripts/editor/mode-c_cpp_sys.js
new file mode 100644
index 00000000..26d5a7c4
--- /dev/null
+++ b/app/scripts/editor/mode-c_cpp_sys.js
@@ -0,0 +1,73 @@
+/* global ace */
+
+ace.define('ace/mode/c_cpp_sys', ['require', 'exports', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/c_cpp_highlight_rules','ace/mode/matching_brace_outdent','ace/range','ace/mode/behaviour/cstyle','ace/mode/folding/cstyle'], function (require, exports) {
+    'use strict';
+
+    var oop = require('../lib/oop');
+    var textMode = require('./text').Mode;
+    var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
+    var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+    var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+    var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+    var Mode = function () {
+        this.HighlightRules = c_cppHighlightRules;
+
+        this.$outdent = new MatchingBraceOutdent();
+        this.$behaviour = new CstyleBehaviour();
+
+        this.foldingRules = new CStyleFoldMode();
+    };
+    oop.inherits(Mode, textMode);
+
+    (function () {
+        this.lineCommentStart = '//';
+        this.blockComment = {start: '/*', end: '*/'};
+
+        this.getNextLineIndent = function (state, line, tab) {
+            var indent = this.$getIndent(line);
+
+            var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
+            //var tokens = tokenizedLine.tokens;
+            var endState = tokenizedLine.state;
+
+            /*if (tokens.length && tokens[tokens.length-1].type == "comment") {
+             return indent;
+             }*/
+
+            var match = line.match(/^.*[\{\(\[][\s]*[^\}\]\)]*$/);
+            if (state === 'start') {
+                if (match) {
+                    indent += tab;
+                }
+            } else if (state === 'doc-start') {
+                if (endState === 'start') {
+                    return '';
+                }
+                match = line.match(/^\s*(\/?)\*/);
+                if (match) {
+                    if (match[1]) {
+                        indent += ' ';
+                    }
+                    indent += '* ';
+                }
+            }
+
+            return indent;
+        };
+
+        this.checkOutdent = function (state, line, input) {
+            return this.$outdent.checkOutdent(line, input);
+        };
+
+        this.autoOutdent = function (state, doc, row) {
+            this.$outdent.autoOutdent(doc, row);
+        };
+
+        this.$id = 'ace/mode/c_cpp_sys';
+    }).call(Mode.prototype);
+
+    exports.Mode = Mode;
+});
+
+

From fb7f95f5470399a05937d59c785572629704f668 Mon Sep 17 00:00:00 2001
From: Siddharth Seth <sseth2@illinois.edu>
Date: Fri, 27 Mar 2015 22:16:06 -0500
Subject: [PATCH 2/2] BugFix#67: Fixing Auto-indent

Changes:

* Fixed code styling issues.

Closes #67
---
 app/scripts/editor/mode-c_cpp_sys.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/scripts/editor/mode-c_cpp_sys.js b/app/scripts/editor/mode-c_cpp_sys.js
index 26d5a7c4..7009f90f 100644
--- a/app/scripts/editor/mode-c_cpp_sys.js
+++ b/app/scripts/editor/mode-c_cpp_sys.js
@@ -1,17 +1,17 @@
-/* global ace */
+/* jshint ignore:start */
 
-ace.define('ace/mode/c_cpp_sys', ['require', 'exports', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/c_cpp_highlight_rules','ace/mode/matching_brace_outdent','ace/range','ace/mode/behaviour/cstyle','ace/mode/folding/cstyle'], function (require, exports) {
+ace.define('ace/mode/c_cpp_sys', ['require', 'exports', 'ace/lib/oop', 'ace/mode/text', 'ace/mode/c_cpp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function (require, exports) {
     'use strict';
 
     var oop = require('../lib/oop');
     var textMode = require('./text').Mode;
-    var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
-    var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-    var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-    var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+    var cppHighlightRules = require('./c_cpp_highlight_rules').c_cppHighlightRules;
+    var MatchingBraceOutdent = require('./matching_brace_outdent').MatchingBraceOutdent;
+    var CstyleBehaviour = require('./behaviour/cstyle').CstyleBehaviour;
+    var CStyleFoldMode = require('./folding/cstyle').FoldMode;
 
     var Mode = function () {
-        this.HighlightRules = c_cppHighlightRules;
+        this.HighlightRules = cppHighlightRules;
 
         this.$outdent = new MatchingBraceOutdent();
         this.$behaviour = new CstyleBehaviour();
@@ -69,5 +69,5 @@ ace.define('ace/mode/c_cpp_sys', ['require', 'exports', 'ace/lib/oop', 'ace/mode
 
     exports.Mode = Mode;
 });
-
+/* jshint ignore:end */