From b2fac20cc63fc51c1ea97458471a02462c3278cd Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 2 Oct 2016 10:09:37 -0400
Subject: [PATCH] Add plain text file type fallback, fix array handling

---
 js/languages.js |  9 +++++++--
 js/main.js      | 25 +++++++++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/js/languages.js b/js/languages.js
index ad9ca06..b111846 100644
--- a/js/languages.js
+++ b/js/languages.js
@@ -162,7 +162,7 @@ let languages = {
 	"Groovy": {
 		file: "groovy",
 		mime: "text/x-groovy",
-		extensions: ["groovy", "grt", "gtpl", "gvy"]
+		extensions: ["groovy", "grt", "gtpl", "gvy", "gradle"]
 	},
 	"HAML": {
 		file: "haml",
@@ -294,6 +294,11 @@ let languages = {
 		mime: "text/x-protobuf",
 		extensions: ["proto"]
 	},
+	"Plain Text": {
+		file: [],
+		mime: "text/plain",
+		extensions: ["txt"]
+	},
 	"R": {
 		file: "r",
 		mime: "text/x-rsrc",
@@ -417,5 +422,5 @@ function getLanguageByExtension(ext) {
 			}
 		}
 	}
-	return null;
+	return languages["Plain Text"];
 }
diff --git a/js/main.js b/js/main.js
index d87ccde..db2978b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -18,9 +18,23 @@ $.get({
 			.then((chunk) => {
 				let lang = getLanguageByExtension(getFileExtension());
 				console.log(`Detected language as ${lang.mime}`);
-				$.getScript(`https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/mode/${lang.file}/${lang.file}.min.js`, () => {
-					setup(chunk, lang.mime);
-				});
+				if (Array.isArray(lang.file)) {
+					if (lang.file.length != 0) {
+						var req = req = $.getScript(`https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/mode/${lang.file[0]}/${lang.file[0]}.min.js`);
+						for (var i = 1; i < lang.file.length; i++) {
+							req = req.then($.getScript(`https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/mode/${lang.file[i]}/${lang.file[i]}.min.js`));
+						}
+						req.then(() => {
+							setup(chunk, lang.mime);
+						});
+					} else {
+						setup(chunk, lang.mime);
+					}
+				} else {
+					$.getScript(`https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.19.0/mode/${lang.file}/${lang.file}.min.js`, () => {
+						setup(chunk, lang.mime);
+					});
+				}
 			})
 			.catch((e) => {
 				throw e;
@@ -260,6 +274,9 @@ function getStartPos() {
 function getEndPos() {
 	var line = editor.doc.size - 1;
 	while (true) {
+		if (line <= editor.doc.size) {
+			return { line: editor.doc.size - 1, ch: editor.doc.getLine(editor.doc.size - 1).length - 1 };
+		}
 		let text = editor.doc.getLine(line);
 		let trimmed = text.trim();
 		if (trimmed.length != 0) {
@@ -304,7 +321,7 @@ function getChunk(code) {
 				let chunk = val[filePath].chunk;
 				let totalChunks = Math.ceil(lines.length / 50);
 				if (chunk == totalChunks - 1) {
-					return lines.slice(totalChunks - (lines.length % 50), lines.length);
+					return lines.slice(lines.length - (lines.length % 50), lines.length);
 				} else {
 					return lines.slice(chunk * 50, (chunk + 1) * 50);
 				}