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

fix custom formatter for the case when formatOnSave is disabled

pull/125/merge
nightwing 2017-04-30 21:48:56 +04:00
rodzic 2795ef0379
commit 82b9de1239
1 zmienionych plików z 22 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
plugins/c9.ide.format/formatters/custom.js
Wyświetl plik

@ -17,8 +17,24 @@ define(function(require, exports, module) {
var ERROR_NOT_FOUND = 127; var ERROR_NOT_FOUND = 127;
var fromFormatCommand;
function load() { function load() {
collab.on("beforeSave", beforeSave, plugin); collab.on("beforeSave", function(e) {
var mode = getMode(e.docId);
var enabled = settings.getBool("project/" + mode + "/@formatOnSave");
if (!enabled && !fromFormatCommand)
return;
if (mode === "javascript" && settings.getBool("project/javascript/@use_jsbeautify"))
return; // use built-in JS Beautify instead
var formatter = settings.get("project/" + mode + "/@formatter");
if (!formatter)
return showError("No code formatter set for " + mode + ": please check your project settings");
e.postProcessor = {
command: "bash",
args: ["-c", formatter]
};
}, plugin);
collab.on("postProcessorError", function(e) { collab.on("postProcessorError", function(e) {
var mode = getMode(e.docId) || "language"; var mode = getMode(e.docId) || "language";
if (e.code !== ERROR_NOT_FOUND) if (e.code !== ERROR_NOT_FOUND)
@ -28,31 +44,17 @@ define(function(require, exports, module) {
+ formatter + " not found, please check your project settings"); + formatter + " not found, please check your project settings");
}); });
format.on("format", function(e) { format.on("format", function(e) {
if (!settings.get("project/" + e.mode + "/@formatOnSave")) if (!settings.get("project/" + e.mode + "/@formatter"))
return; return;
if (e.mode === "javascript" && settings.getBool("project/javascript/@use_jsbeautify")) if (e.mode === "javascript" && settings.getBool("project/javascript/@use_jsbeautify"))
return; // use built-in JS Beautify instead return; // use built-in JS Beautify instead
save.save(tabs.currentTab); fromFormatCommand = true;
save.save(tabs.focussedTab);
fromFormatCommand = false;
return true; return true;
}, plugin); }, plugin);
} }
function beforeSave(e) {
var mode = getMode(e.docId);
var enabled = settings.getBool("project/" + mode + "/@formatOnSave");
if (!enabled)
return;
if (mode === "javascript" && settings.getBool("project/javascript/@use_jsbeautify"))
return; // use built-in JS Beautify instead
var formatter = settings.get("project/" + mode + "/@formatter");
if (!formatter)
return showError("No code formatter set for " + mode + ": please check your project settings");
e.postProcessor = {
command: "bash",
args: ["-c", formatter]
};
}
function getMode(docId) { function getMode(docId) {
var tab = tabs.findTab(docId); var tab = tabs.findTab(docId);
if (!tab || !tab.editor || !tab.editor.ace) if (!tab || !tab.editor || !tab.editor.ace)
@ -64,7 +66,7 @@ define(function(require, exports, module) {
load(); load();
}); });
plugin.on("unload", function() { plugin.on("unload", function() {
fromFormatCommand = false;
}); });
/** /**