From f5fe64d1f2b83f42ba6bfcedc35177d4757bf207 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Dec 2015 14:34:21 +0400 Subject: [PATCH 01/14] fix matching bracket highlighting in js templates --- .../lib/ace/mode/_test/text_javascript.txt | 5 +++ .../lib/ace/mode/_test/tokens_javascript.json | 42 ++++++++++++++++++- .../ace/mode/javascript_highlight_rules.js | 3 +- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt index e91c5c60..d65f3fb4 100644 --- a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt +++ b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt @@ -93,3 +93,8 @@ z=
{ ++x }
+var o = { + t:`${[].map(x => { + return x + })}` +}; \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json index 29098f5a..388c2639 100644 --- a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json +++ b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json @@ -686,5 +686,45 @@ ],[ "start" ],[ - "start" + "start", + ["storage.type","var"], + ["text"," "], + ["identifier","o"], + ["text"," "], + ["keyword.operator","="], + ["text"," "], + ["paren.lparen","{"] +],[ + ["start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"], + ["text"," "], + ["identifier","t"], + ["punctuation.operator",":"], + ["string.quasi.start","`"], + ["paren.quasi.start","${"], + ["paren.lparen","["], + ["paren.rparen","]"], + ["punctuation.operator","."], + ["identifier","map"], + ["paren.lparen","("], + ["identifier","x"], + ["text"," "], + ["keyword.operator","=>"], + ["text"," "], + ["paren.lparen","{"] +],[ + ["#tmp","no_regex","start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"], + ["text"," "], + ["keyword","return"], + ["text"," "], + ["identifier","x"] +],[ + "no_regex", + ["text"," "], + ["paren.rparen","})"], + ["paren.quasi.end","}"], + ["string.quasi.end","`"] +],[ + "start", + ["paren.rparen","}"], + ["punctuation.operator",";"] ]] \ No newline at end of file diff --git a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js index 86855f9c..9aa86966 100644 --- a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js +++ b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js @@ -354,9 +354,8 @@ var JavaScriptHighlightRules = function(options) { this.next = val == "{" ? this.nextState : ""; if (val == "{" && stack.length) { stack.unshift("start", state); - return "paren"; } - if (val == "}" && stack.length) { + else if (val == "}" && stack.length) { stack.shift(); this.next = stack.shift(); if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1) From f0aca9fe2a052296cb88f656a03bfb520e41e1b2 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 24 Dec 2015 02:38:42 +0400 Subject: [PATCH 02/14] reset scrollbar position when changing session --- node_modules/ace/lib/ace/virtual_renderer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/node_modules/ace/lib/ace/virtual_renderer.js b/node_modules/ace/lib/ace/virtual_renderer.js index a221d46c..a87b7860 100644 --- a/node_modules/ace/lib/ace/virtual_renderer.js +++ b/node_modules/ace/lib/ace/virtual_renderer.js @@ -245,6 +245,7 @@ var VirtualRenderer = function(container, theme) { this.$loop.schedule(this.CHANGE_FULL); // this.session.$setFontMetrics(this.$fontMetrics); + this.scrollBarV.scrollLeft = this.scrollBarV.scrollTop = null; this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this); this.onChangeNewLineMode() From a53be54f563a7d5147fc930a914a5e5ad450bc6d Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Dec 2015 16:00:27 +0400 Subject: [PATCH 03/14] fix raygun error trying to clone Date --- node_modules/ace/lib/ace/lib/lang.js | 10 ++++------ plugins/c9.fs/fs.cache.xml.js | 12 ++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/node_modules/ace/lib/ace/lib/lang.js b/node_modules/ace/lib/ace/lib/lang.js index f306e3e4..ab3d4d51 100644 --- a/node_modules/ace/lib/ace/lib/lang.js +++ b/node_modules/ace/lib/ace/lib/lang.js @@ -74,7 +74,7 @@ exports.copyArray = function(array){ var copy = []; for (var i=0, l=array.length; i Date: Tue, 29 Dec 2015 23:09:34 +0400 Subject: [PATCH 04/14] fix collab not connecting for files opened by show active file --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b1892e8..42a32d16 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#a70b174dd2", "c9.ide.language.javascript.infer": "#8d2f248e33", "c9.ide.language.jsonalyzer": "#f94698abff", - "c9.ide.collab": "#30efed939e", + "c9.ide.collab": "#10c224f9b8", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c3bf17286d", From 00998f58c28045da6aa1967adb11e0671aa5ab68 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Dec 2015 19:55:30 +0100 Subject: [PATCH 05/14] c9-auto-bump 3.1.873 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b1892e8..05e9ab24 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.872", + "version": "3.1.873", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f837637efa5aec67d5f01f5608aea1fbc192565a Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Dec 2015 09:23:06 +0100 Subject: [PATCH 06/14] c9-auto-bump 3.1.874 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05e9ab24..f28f4c1b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.873", + "version": "3.1.874", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 210a2032e0f447b17081e01f340d9b2b4dbbb2b8 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 10:38:36 +0000 Subject: [PATCH 07/14] Improve PYTHONPATH handling --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f28f4c1b..a414ce32 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#b3a4891ca7", "c9.ide.language.javascript.tern": "#a70b174dd2", "c9.ide.language.javascript.infer": "#8d2f248e33", - "c9.ide.language.jsonalyzer": "#f94698abff", + "c9.ide.language.jsonalyzer": "#2ebf2b73d6", "c9.ide.collab": "#30efed939e", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#e33fbaed2f", @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#e0deed4000", + "c9.ide.language.python": "#31e57cb10b", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From f068de771f5756422408754a0a1d563784a66f5a Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 10:38:45 +0000 Subject: [PATCH 08/14] Support PYTHONPATH for linter --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a414ce32..dcbf7431 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#31e57cb10b", + "c9.ide.language.python": "#56279528b8", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From 2c3afc367ec683ae1bf20bc1d9827639a88c9cd9 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Dec 2015 10:45:48 +0000 Subject: [PATCH 09/14] Use PYTHONPATH setting for runners --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dcbf7431..2a8ebc60 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#56279528b8", + "c9.ide.language.python": "#ed39fb324b", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", @@ -103,7 +103,7 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#2b12cd1bdd", - "c9.ide.run": "#d37ffe17d5", + "c9.ide.run": "#e449c6c0f8", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#70aeb327c0", "c9.ide.save": "#9461acd953", From 97b2b488e3e95923d4528c5d357a0dbe8fe16761 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Dec 2015 11:52:19 +0100 Subject: [PATCH 10/14] c9-auto-bump 3.1.875 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a8ebc60..cc1b16e3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.874", + "version": "3.1.875", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 23b5c9b75d4b339671bf098f356e03f7e6a366a8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Dec 2015 11:56:03 +0100 Subject: [PATCH 11/14] c9-auto-bump 3.1.876 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc1b16e3..2bfc801d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.875", + "version": "3.1.876", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f42dcf1a314c4b2cca292634caf4b270f782933a Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Dec 2015 11:57:04 +0100 Subject: [PATCH 12/14] c9-auto-bump 3.1.877 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 273113a4..60a2db24 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.876", + "version": "3.1.877", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7b5d31693cf0704901d933efa01b8c6ae4673fda Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Dec 2015 18:41:33 +0400 Subject: [PATCH 13/14] it is easy to accidentally type shift-backspace instead of backspace --- plugins/c9.ide.terminal/aceterm/input.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index cee51cdc..2fb3e2bc 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -68,10 +68,10 @@ define(function(require, exports, module) { bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"}, name: "\u001bd" // "alt-d" }, { - bindKey: {win: "Alt-Backspace|Shift-Backspace", mac: "Ctrl-Backspace|Shift-Backspace"}, + bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"}, name: "\u0015" // "ctrl-u" }, { - bindKey: {win: "Alt-Delete|Shift-Delete", mac: "Ctrl-Delete|Shift-Delete"}, + bindKey: {win: "Alt-Delete", mac: "Ctrl-Delete"}, name: "\u000b" // "ctrl-k" }, { bindKey: {win: "Ctrl-z", mac: "Cmd-z"}, From eaca2c3e59cf328ab9d4235a3c3175c7416f6e32 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Dec 2015 17:37:05 +0100 Subject: [PATCH 14/14] c9-auto-bump 3.1.878 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 60a2db24..3f9cdf97 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.877", + "version": "3.1.878", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",