mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request +14725 from c9/ide-fix-various 

Ide fix various
pull/355/head
Harutyun Amirjanyan 2016-08-29 14:47:57 +04:00 zatwierdzone przez GitHub
rodzic cccf7bf3ce f9773a91dc
commit 2df04a371e
6 zmienionych plików z 52 dodań i 53 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
node_modules/ace/lib/ace/mode/javascript_highlight_rules.js wygenerowano vendored
Wyświetl plik

@ -171,6 +171,9 @@ var JavaScriptHighlightRules = function(options) {
token : "punctuation.operator", token : "punctuation.operator",
regex : /[.](?![.])/, regex : /[.](?![.])/,
next : "property" next : "property"
}, {
token : "storage.type",
regex : /=>/
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/, regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?\:|[!$%&*+\-~\/^]=?/,

10
package.json
Wyświetl plik

@ -16,7 +16,7 @@
"connect": "~2.12.0", "connect": "~2.12.0",
"debug": "~0.7.4", "debug": "~0.7.4",
"ejs": "~1.0.0", "ejs": "~1.0.0",
"emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad", "emmet": "git+https://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
"engine.io": "1.6.9", "engine.io": "1.6.9",
"engine.io-client": "1.6.9", "engine.io-client": "1.6.9",
"jsonm": "1.0.6", "jsonm": "1.0.6",
@ -25,15 +25,15 @@
"mime": "~1.2.9", "mime": "~1.2.9",
"mkdirp": "~0.3.5", "mkdirp": "~0.3.5",
"msgpack-js-browser": "~0.1.4", "msgpack-js-browser": "~0.1.4",
"nak": "https://github.com/cloud9ide/nak.git#6deef931594", "nak": "git+https://github.com/cloud9ide/nak.git#6deef931594",
"netutil": "~0.0.2", "netutil": "~0.0.2",
"optimist": "~0.6.0", "optimist": "~0.6.0",
"qs": "0.6.6", "qs": "0.6.6",
"rusha": "^0.8.3", "rusha": "^0.8.3",
"send": "~0.1.4", "send": "~0.1.4",
"simple-mime": "~0.0.8", "simple-mime": "~0.0.8",
"tern": "https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e", "tern": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
"tern_from_ts": "https://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4", "tern_from_ts": "git+https://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4",
"through": "2.2.0", "through": "2.2.0",
"tmp": "~0.0.20", "tmp": "~0.0.20",
"uglify-js": "~2.6.2", "uglify-js": "~2.6.2",
@ -71,7 +71,7 @@
"c9.ide.language.javascript.infer": "#b9c2e4bdb8", "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
"c9.ide.language.jsonalyzer": "#a0549e14ff", "c9.ide.language.jsonalyzer": "#a0549e14ff",
"c9.ide.language.codeintel": "#0fe92d6f46", "c9.ide.language.codeintel": "#0fe92d6f46",
"c9.ide.collab": "#39fc27d13f", "c9.ide.collab": "#c94a0ac61d",
"c9.ide.local": "#9169fec157", "c9.ide.local": "#9169fec157",
"c9.ide.find": "#e632ecf4be", "c9.ide.find": "#e632ecf4be",
"c9.ide.find.infiles": "#ad9ff74638", "c9.ide.find.infiles": "#ad9ff74638",

27
plugins/c9.ide.ace/ace.js
Wyświetl plik

@ -589,33 +589,26 @@ define(function(require, exports, module) {
new Divider({ position: 60 }, handle) new Divider({ position: 60 }, handle)
] ]
}, handle); }, handle);
menus.addItemByPath("context/ace/", mnuAce, 0, handle);
mnuGutter = new Menu({ menus.addItemByPath("context/ace-gutter/", mnuGutter = new Menu({
id: "menuGutter", id: "menuGutter",
items: [ items: [
new Divider({ position: 1000 }, handle), new Divider({ position: 1000 }, handle),
new MenuItem({ ]
position: 1000, }, handle), 0, handle);
caption: "Gutter Options", menus.addItemByPath("context/ace-gutter/Gutter Options/", new ui.menu({}), 1100, handle);
submenu: new Menu({ menus.addItemByPath("context/ace-gutter/Gutter Options/Show Line Numbers", new ui.item({
items: [
new MenuItem({
position: 10,
caption: "Show Line Numbers", caption: "Show Line Numbers",
type: "check", type: "check",
checked: "user/ace/@showLineNumbers" checked: "user/ace/@showLineNumbers"
}, handle), }, handle), 100, handle);
new MenuItem({ menus.addItemByPath("context/ace-gutter/Gutter Options/Show Fold Widgets", new ui.item({
position: 10,
caption: "Show Fold Widgets", caption: "Show Fold Widgets",
type: "check", type: "check",
checked: "user/ace/@showFoldWidgets" checked: "user/ace/@showFoldWidgets"
}, handle), }, handle), 200, handle);
]
})
}, handle),
]
}, handle);
mnuGutter.on("show", function(e) { mnuGutter.on("show", function(e) {
var ace = tabs.focussedTab.editor.ace; var ace = tabs.focussedTab.editor.ace;
var region = ace.renderer.$gutterLayer.getRegion(e); var region = ace.renderer.$gutterLayer.getRegion(e);

1
plugins/c9.ide.tree/tree.js
Wyświetl plik

@ -551,6 +551,7 @@ define(function(require, exports, module) {
var mnuCtxTree = plugin.getElement("mnuCtxTree"); var mnuCtxTree = plugin.getElement("mnuCtxTree");
menus.decorate(mnuCtxTree); menus.decorate(mnuCtxTree);
plugin.addElement(mnuCtxTree); plugin.addElement(mnuCtxTree);
menus.addItemByPath("context/tree/", mnuCtxTree, 0, plugin);
menus.addItemToMenu(mnuCtxTree, new ui.item({ menus.addItemToMenu(mnuCtxTree, new ui.item({
match: "file", match: "file",

8
plugins/c9.ide.ui/menus.js
Wyświetl plik

@ -466,14 +466,14 @@ define(function(require, exports, module) {
return; return;
} }
if (!plugin)
plugin = menu, menu = null;
if (index && typeof index == "object") if (index && typeof index == "object")
plugin = index, index = null; plugin = index, index = null;
else if (menu instanceof Menu) else if (!plugin && menu && menu.aml)
menu = menu.aml; menu = menu.aml;
else if (menu && !menu.nodeFunc)
plugin = menu, menu = null;
if (menuItem instanceof MenuItem || menuItem instanceof Divider) if (menuItem && menuItem.aml)
menuItem = menuItem.aml; menuItem = menuItem.aml;
assert(plugin !== undefined, "addItemByPath requires a plugin argument"); assert(plugin !== undefined, "addItemByPath requires a plugin argument");

46
scripts/install-sdk.sh
Wyświetl plik

@ -15,8 +15,8 @@ else
exit 1 exit 1
fi fi
cd `dirname $0`/.. cd "$(dirname "$0")/.."
SOURCE=`pwd` SOURCE=$(pwd)
uname="$(uname -a)" uname="$(uname -a)"
os= os=
@ -44,37 +44,38 @@ blue=$'\e[01;34m'
magenta=$'\e[01;35m' magenta=$'\e[01;35m'
resetColor=$'\e[0m' resetColor=$'\e[0m'
NO_PULL= # NO_PULL=
NO_GLOBAL_INSTALL= # NO_GLOBAL_INSTALL=
FORCE= # FORCE=
updatePackage() { updatePackage() {
name=$1 name=$1
cd "$SOURCE"
REPO=https://github.com/c9/$name REPO=https://github.com/c9/$name
echo "${green}checking out ${resetColor}$REPO" echo "${green}checking out ${resetColor}$REPO"
if ! [[ -d ./plugins/$name ]]; then if ! [[ -d ./plugins/"$name" ]]; then
mkdir -p ./plugins/$name mkdir -p ./plugins/"$name"
fi fi
pushd ./plugins/$name pushd ./plugins/"$name"
if ! [[ -d .git ]]; then if ! [[ -d .git ]]; then
git init git init
# git remote rm origin || true # git remote rm origin || true
git remote add origin $REPO git remote add origin "$REPO"
fi fi
version=`"$NODE" -e 'console.log((require("../../package.json").c9plugins["'$name'"].substr(1) || "origin/master"))'`; version=$("$NODE" -e 'console.log((require("../../package.json").c9plugins["'"$name"'"].substr(1) || "origin/master"))');
rev=`git rev-parse --revs-only $version` rev=$(git rev-parse --revs-only "$version")
if [ "$rev" == "" ]; then if [ "$rev" == "" ]; then
git fetch origin git fetch origin
fi fi
status=`git status --porcelain --untracked-files=no` status=$(git status --porcelain --untracked-files=no)
if [ "$status" == "" ]; then if [ "$status" == "" ] || [ "$FORCE" == "1" ]; then
git reset $version --hard git reset "$version" --hard
else else
echo "${yellow}$name ${red}contains uncommited changes.${yellow} Skipping...${resetColor}" echo "${yellow}$name ${red}contains uncommited changes.${yellow} Skipping...${resetColor}"
fi fi
@ -82,22 +83,23 @@ updatePackage() {
} }
updateAllPackages() { updateAllPackages() {
c9packages=`"$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))'`; c9packages=$("$NODE" -e 'console.log(Object.keys(require("./package.json").c9plugins).join(" "))');
count=${#c9packages[@]} count=${#c9packages[@]}
i=0 i=0
for m in ${c9packages[@]}; do echo $m; for m in "${c9packages[@]}"; do
i=$(($i + 1)) echo "$m"
i=$((i + 1))
echo "updating plugin ${blue}$i${resetColor} of ${blue}$count${resetColor}" echo "updating plugin ${blue}$i${resetColor} of ${blue}$count${resetColor}"
updatePackage $m updatePackage "$m" || updatePackage "$m"
done done
} }
updateNodeModules() { updateNodeModules() {
echo "${magenta}--- Running npm install --------------------------------------------${resetColor}" echo "${magenta}--- Running npm install --------------------------------------------${resetColor}"
safeInstall(){ safeInstall(){
deps=`"$NODE" -e 'console.log(Object.keys(require("./package.json").dependencies).join(" "))'`; deps=$("$NODE" -e 'console.log(Object.keys(require("./package.json").dependencies).join(" "))');
for m in ${deps[@]}; do echo $m; for m in "${deps[@]}"; do echo "$m";
"$NPM" install --loglevel warn $m || true "$NPM" install --loglevel warn "$m"
done done
} }
"$NPM" install || safeInstall "$NPM" install || safeInstall
@ -144,7 +146,7 @@ installGlobalDeps() {
############################################################################ ############################################################################
export C9_DIR="$HOME"/.c9 export C9_DIR="$HOME"/.c9
if ! [[ `which npm` ]]; then if ! [[ $(which npm) ]]; then
if [[ $os == "windows" ]]; then if [[ $os == "windows" ]]; then
export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH" export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH"
else else