From 4f197a4a86473b06351bbd977b47a421317f76ae Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Tue, 29 Dec 2015 12:38:13 +0000 Subject: [PATCH 01/14] Fix bogus warning Fixes +11303 --- node_modules/c9/urls.js | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/node_modules/c9/urls.js b/node_modules/c9/urls.js index 0ce9c60e..240931ff 100644 --- a/node_modules/c9/urls.js +++ b/node_modules/c9/urls.js @@ -94,7 +94,7 @@ function getBaseUrl(req, sourceBaseUrlPattern, targetBaseUrlPattern) { targetHost = "c9.io"; } - if (/^(ide|vfs)./.test(targetHost)) + if (/^(ide|vfs)\./.test(targetHost)) console.trace("Warning: possibly incorrect baseUrl constructed, with 'ide.' in the hostname: " + targetHost); return replaceDomain(targetBaseUrlPattern, targetHost) diff --git a/package.json b/package.json index d94a392a..43d0ed40 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", "c9.ide.language.python": "#660b42e3a3", + "c9.ide.language.go": "#undefined", "c9.ide.mount": "#befb8188d5", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", From 60b61aa22eef71a0e5f2a22209c05cac3414f7d5 Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 15 Jan 2016 19:34:01 +0400 Subject: [PATCH 02/14] show paths in openfiles similar to changes panel --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d31478c3..56105f1a 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.mount": "#915b3d20be", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", - "c9.ide.openfiles": "#7fa4a97fed", + "c9.ide.openfiles": "#b11517abf6", "c9.ide.preview": "#8f87ff2f6a", "c9.ide.preview.browser": "#c5b9a129de", "c9.ide.preview.markdown": "#bc846e1562", From 002b3f4b48a34906276c20eadafa6f80c5518a16 Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 15 Jan 2016 19:34:53 +0400 Subject: [PATCH 03/14] fix more... menuitem in tabbar popup --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 56105f1a..6483ec9a 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#3aab0b67e0", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#5ae88f87e1", + "c9.ide.behaviors": "#db32109ebc", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8", @@ -96,7 +96,7 @@ "c9.ide.mount": "#915b3d20be", "c9.ide.navigate": "#38ae100ea1", "c9.ide.newresource": "#981a408a7b", - "c9.ide.openfiles": "#b11517abf6", + "c9.ide.openfiles": "#358ac94915", "c9.ide.preview": "#8f87ff2f6a", "c9.ide.preview.browser": "#c5b9a129de", "c9.ide.preview.markdown": "#bc846e1562", From a426edd313e3aa13b80473bc9b3977b6d66a81e9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 16 Jan 2016 04:51:15 +0400 Subject: [PATCH 04/14] always normalize paths in c9.fs fixes issue with language adding directories named .. into tree --- plugins/c9.fs/fs.cache.xml.js | 37 ++++++++++++++++++++++++----------- plugins/c9.fs/fs.js | 6 ++++++ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index 9d0babbe..da06cc24 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -216,7 +216,7 @@ define(function(require, exports, module) { : (linkInfo ? { link: true, linkStat: { fullPath: linkInfo } } : {}); - stat.mtime = Math.floor(Date.now() / 1000); + stat.mtime = Date.now(); node = createNode(e.path, stat); emit("add", {path : e.path, node : node}); @@ -464,15 +464,30 @@ define(function(require, exports, module) { var parts = path.split("/"); var node = context || model.root; if (!node) { - node = orphans[parts[0]]; //model.realRoot || + node = orphans[parts[0]]; // model.realRoot || if (node) parts.shift(); } if (path == "/") parts.shift(); + var up = 0; + for (var i = parts.length; i--;) { + var p = parts[i]; + if (!p && i || p === ".") { + parts.splice(i, 1); + } + else if (p === "..") { + parts.splice(i, 1); + up++; + } + else if (up) { + parts.splice(i, 1); + up--; + } + } + for (var i = 0; i < parts.length; i++) { var p = parts[i]; - if (!p && i) continue; // allow paths with trailing / if (node) node = node.map && node.map[p]; if (!node) @@ -579,6 +594,14 @@ define(function(require, exports, module) { node.children = null; + if (typeof node.mtime !== "number" && node.mtime) { + // why Date ends up here? + reportError(new Error("Date in fs cache"), { + stat: stat, + mtime: node.mtime, + path: node.path + }); + } if (!updating) { if (!modified.length) modified.push(parent); @@ -629,14 +652,6 @@ define(function(require, exports, module) { }); } else if (key === "children" || key === "isSelected") { prop = null; - } else if (Object.prototype.toString.call(node[key]) == "[object Date]") { - // why Date ends up here? - reportError(new Error("Date in fs cache"), { - key: key, - value: node[key], - path: node.path, - hasParentProp: !!node.parent, - }); } else { prop = lang.deepCopy(node[key]); } diff --git a/plugins/c9.fs/fs.js b/plugins/c9.fs/fs.js index 04e2d42d..f07b7746 100644 --- a/plugins/c9.fs/fs.js +++ b/plugins/c9.fs/fs.js @@ -21,6 +21,7 @@ define(function(require, exports, module) { var stream = require("./fs.streams")(vfs, options.base, options.baseProc, options.cli); var xhr = options.cli ? stream : require("./fs.xhr")(vfs.rest); var uCaseFirst = require("c9/string").uCaseFirst; + var normalize = require("path").normalize; var api = { readFile: xhr.readFile, @@ -65,6 +66,11 @@ define(function(require, exports, module) { if (typeof args[args.length - 1] != "function") throw new Error("Missing callback for " + name); + path = args[0] = normalize(path); + if (name == "rename" || name == "copy" || name == "symlink") { + args[1] = normalize(args[1]); + } + // // TODO disabled to not break local version on windows // if (!/^[!~/]/.test(path)) { // var e = new Error("Invalid path passed to fs " + name); From 7d7686ae7abf88f70d4f643983c21d46a2d9110c Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sun, 17 Jan 2016 11:10:04 +0000 Subject: [PATCH 05/14] Remove ancient completion delay We have caching to protect against overworking now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed962e79..bf8ef39f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#9d12de412d", + "c9.ide.language": "#3f4dfdefd8", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From b5c8d756455d38a806d937bb5624d7e126b8b8b8 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 18 Jan 2016 15:09:10 +0100 Subject: [PATCH 06/14] Backport small changes from milliseconds branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf8ef39f..595ec655 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#3f4dfdefd8", + "c9.ide.language": "#af057c3046", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From 200c99ab3d2b8d4d8919dd86f81e55df0a244244 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 20 Jan 2016 10:53:34 +0100 Subject: [PATCH 07/14] Fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 595ec655..c273079f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#af057c3046", + "c9.ide.language": "#85a6944ba8", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From afcb8fa8f0674adc46dcd85e3c937234198b2fef Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 11:53:15 +0100 Subject: [PATCH 08/14] c9-auto-bump 3.1.1103 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b62f7c1d..87a01a01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1102", + "version": "3.1.1103", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6ca550b13757fc1cace062311e76b8d95ea709a8 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 20 Jan 2016 14:49:47 +0100 Subject: [PATCH 09/14] Fix typo (?) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c273079f..6e865a1b 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#85a6944ba8", + "c9.ide.language": "#b21c9828b3", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#2b5cc6275e", "c9.ide.language.html": "#9be847c0ce", From 6e75991ab4947fd996e83a84bc35288ea88fede9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 14:50:16 +0100 Subject: [PATCH 10/14] c9-auto-bump 3.1.1104 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b91f275a..2e256193 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1103", + "version": "3.1.1104", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f2016652a6890f7cbe593ae69854f9f1ce19d32b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 14:50:34 +0100 Subject: [PATCH 11/14] c9-auto-bump 3.1.1105 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e256193..d06d4d38 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1104", + "version": "3.1.1105", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5e4824c440e9c357a470be6b1d4b3f784c290bc6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 14:50:53 +0100 Subject: [PATCH 12/14] c9-auto-bump 3.1.1106 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85045e88..1685fb2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1105", + "version": "3.1.1106", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 286175d2b1de13766199324b0d26a2774656d963 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 14:53:56 +0100 Subject: [PATCH 13/14] c9-auto-bump 3.1.1107 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1685fb2f..a7f08bfc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1106", + "version": "3.1.1107", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 508d90f5acab63d75fbffa0ca57d601f23280940 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 20 Jan 2016 15:05:59 +0100 Subject: [PATCH 14/14] c9-auto-bump 3.1.1108 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a7f08bfc..03a76b43 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1107", + "version": "3.1.1108", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",