Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 2c6a356

Browse files
thehogfatherthehogfather
committed
Moved preference strings from nls/lang to vars in Prefs.js
Changes to all preferences are now live Removed region-fold and custom-region fold strings
1 parent 797ed3f commit 2c6a356

File tree

10 files changed

+57
-168
lines changed

10 files changed

+57
-168
lines changed

‎src/extensions/default/CodeFolding/Prefs.js‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,35 @@
88
/*global define, brackets*/
99
define(function (require, exports, module) {
1010
"use strict";
11-
var PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
12-
prefs = PreferencesManager.getExtensionPrefs("code-folding"),
13-
strings = brackets.getModule("strings"),
14-
foldsKey = "code-folding.folds";
11+
var PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
12+
prefs = PreferencesManager.getExtensionPrefs("code-folding"),
13+
foldsKey = "code-folding.folds",
14+
// preference key strings are here for now since they are not used in any UI
15+
ENABLE_CODE_FOLDING = "Enable code folding",
16+
MIN_FOLD_SIZE = "Minimum fold size",
17+
MIN_FOLD_SIZE_HELP = "Minimum number of lines to allow in a foldable range",
18+
SAVE_FOLD_STATES = "Save fold states",
19+
SAVE_FOLD_STATES_HELP = "Save fold states to disk when editor is closed and restore the folds when reopened",
20+
ALWAYS_USE_INDENT_FOLD = "Always use indent fold",
21+
ALWAYS_USE_INDENT_FOLD_HELP = "Fall back to using level of indentation as a folding guideline if no range finder is found for the current mode.",
22+
FADE_FOLD_BUTTONS = "Fade fold buttons",
23+
FADE_FOLD_BUTTONS_HELP = "Hides the fold buttons unless the mouse is over the gutter",
24+
MAX_FOLD_LEVEL = "Max fold level",
25+
MAX_FOLD_LEVEL_HELP = "Used to limit the number of nested folds to find and collapse when View -> Collapse All is called or Alt is held down when collapsing. Should improve performance for large files.";
1526

1627
//default preference values
1728
prefs.definePreference("enabled", "boolean", true,
18-
{name: strings.ENABLE_CODE_FOLDING, description: strings.ENABLE_CODE_FOLDING});
29+
{name: ENABLE_CODE_FOLDING, description: ENABLE_CODE_FOLDING});
1930
prefs.definePreference("minFoldSize", "number", 2,
20-
{name: strings.MIN_FOLD_SIZE, description: strings.MIN_FOLD_SIZE_HELP});
31+
{name: MIN_FOLD_SIZE, description: MIN_FOLD_SIZE_HELP});
2132
prefs.definePreference("saveFoldStates", "boolean", true,
22-
{name: strings.SAVE_FOLD_STATES, description: strings.SAVE_FOLD_STATES_HELP});
33+
{name: SAVE_FOLD_STATES, description: SAVE_FOLD_STATES_HELP});
2334
prefs.definePreference("alwaysUseIndentFold", "boolean", false,
24-
{name: strings.ALWAYS_USE_INDENT_FOLD, description: strings.ALWAYS_USE_INDENT_FOLD_HELP});
25-
prefs.definePreference("enableRegionFolding", "boolean", false,
26-
{name: strings.ENABLE_REGION_FOLDING, description: strings.ENABLE_REGION_FOLDING});
35+
{name: ALWAYS_USE_INDENT_FOLD, description: ALWAYS_USE_INDENT_FOLD_HELP});
2736
prefs.definePreference("fadeFoldButtons", "boolean", false,
28-
{name: strings.FADE_FOLD_BUTTONS, description: strings.FADE_FOLD_BUTTONS_HELP});
37+
{name: FADE_FOLD_BUTTONS, description: FADE_FOLD_BUTTONS_HELP});
2938
prefs.definePreference("maxFoldLevel", "number", 2,
30-
{name: strings.MAX_FOLD_LEVEL, description: strings.MAX_FOLD_LEVEL_HELP});
39+
{name: MAX_FOLD_LEVEL, description: MAX_FOLD_LEVEL_HELP});
3140
prefs.definePreference("folds", "object", {});
3241

3342
/**

‎src/extensions/default/CodeFolding/foldhelpers/foldcode.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ define(function (require, exports, module) {
2626
}
2727

2828
var finder = options.rangeFinder || CodeMirror.fold.auto,
29-
minSize = options.minFoldSize || prefs.getSetting("minFoldSize"),
3029
range,
3130
widget,
3231
textRange;
3332

3433
function getRange(allowFolded) {
3534
var range = options.range || finder(cm, pos);
36-
if (!range || range.to.line - range.from.line < minSize) {
35+
if (!range || range.to.line - range.from.line < prefs.getSetting("minFoldSize")) {
3736
return null;
3837
}
3938
var marks = cm.findMarksAt(range.from),
@@ -77,7 +76,7 @@ define(function (require, exports, module) {
7776
range = getRange(false);
7877
}
7978
}
80-
if (!range || range.cleared || force === "unfold" || range.to.line - range.from.line < minSize) {
79+
if (!range || range.cleared || force === "unfold" || range.to.line - range.from.line < prefs.getSetting("minFoldSize")) {
8180
if (range) { range.cleared = false; }
8281
return;
8382
}
@@ -206,7 +205,7 @@ define(function (require, exports, module) {
206205
* @param {?number} end the line number for the end of the region to fold
207206
*/
208207
CodeMirror.commands.foldToLevel = function (cm, start, end) {
209-
var rf = CodeMirror.fold.auto, level = prefs.getSetting("maxFoldLevel");
208+
var rf = CodeMirror.fold.auto;
210209
function foldLevel(n, from, to) {
211210
if (n > 0) {
212211
var i = from, range;
@@ -226,7 +225,7 @@ define(function (require, exports, module) {
226225
cm.operation(function () {
227226
start = start === undefined ? cm.firstLine() : start;
228227
end = end || cm.lastLine();
229-
foldLevel(level, start, end);
228+
foldLevel(prefs.getSetting("maxFoldLevel"), start, end);
230229
});
231230
};
232231

‎src/extensions/default/CodeFolding/foldhelpers/foldgutter.js‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ define(function (require, exports, module) {
222222
window.clearTimeout(state.changeUpdate);
223223
state.changeUpdate = window.setTimeout(function () {
224224
updateInViewport(cm);
225-
}, prefs.getSetting("foldOnChangeTimeSpan") || 600);
225+
}, 600);
226226
}
227227
}
228228

@@ -253,7 +253,7 @@ define(function (require, exports, module) {
253253
}
254254
});
255255
}
256-
}, prefs.getSetting("updateViewportTimeSpan") || 400);
256+
}, 400);
257257
}
258258

259259
/**
@@ -312,15 +312,6 @@ define(function (require, exports, module) {
312312
});
313313
}
314314

315-
function remove(cm) {
316-
var gutters = cm.getOption("gutters").slice(0);
317-
var index = gutters.indexOf("CodeMirror-foldgutter");
318-
gutters.splice(index, 1);
319-
cm.setOption("gutters", gutters);
320-
CodeMirror.defineOption("foldGutter", false, null);
321-
}
322-
323-
exports.remove = remove;
324315
exports.init = init;
325316
exports.clearGutter = clearGutter;
326317
exports.updateInViewport = updateInViewport;

‎src/extensions/default/CodeFolding/foldhelpers/region-fold.js‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/extensions/default/CodeFolding/main.js‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ define(function (require, exports, module) {
6363
//e.g. collapsing all children when 'alt' key is pressed
6464
var foldGutter = require("foldhelpers/foldgutter"),
6565
foldCode = require("foldhelpers/foldcode"),
66-
indentFold = require("foldhelpers/indentFold"),
67-
regionFold = require("foldhelpers/region-fold");
68-
66+
indentFold = require("foldhelpers/indentFold");
6967
/**
7068
* Restores the linefolds in the editor using values fetched from the preference store
7169
* Checks the document to ensure that changes have not been made (e.g., in a different editor)
@@ -74,10 +72,10 @@ define(function (require, exports, module) {
7472
*/
7573
function restoreLineFolds(editor) {
7674
var saveFolds = prefs.getSetting("saveFoldStates");
77-
if (!editor || !saveFolds) { return; }
78-
75+
if (!editor || !saveFolds) {
76+
return;
77+
}
7978
var cm = editor._codeMirror;
80-
if (!cm) {return; }
8179
var path = editor.document.file.fullPath;
8280
var folds = cm._lineFolds || prefs.getFolds(path);
8381
cm._lineFolds = cm.getValidFolds(folds);
@@ -93,7 +91,9 @@ define(function (require, exports, module) {
9391
*/
9492
function saveLineFolds(editor) {
9593
var saveFolds = prefs.getSetting("saveFoldStates");
96-
if (!editor || !saveFolds) { return; }
94+
if (!editor || !saveFolds) {
95+
return;
96+
}
9797
var folds = editor._codeMirror._lineFolds || {};
9898
var path = editor.document.file.fullPath;
9999
if (Object.keys(folds).length) {
@@ -184,7 +184,7 @@ define(function (require, exports, module) {
184184
*/
185185
function collapseAll() {
186186
var editor = EditorManager.getFocusedEditor();
187-
if (editor && editor._codeMirror) {
187+
if (editor) {
188188
var cm = editor._codeMirror;
189189
CodeMirror.commands.foldToLevel(cm);
190190
}
@@ -195,7 +195,7 @@ define(function (require, exports, module) {
195195
*/
196196
function expandAll() {
197197
var editor = EditorManager.getFocusedEditor();
198-
if (editor && editor._codeMirror) {
198+
if (editor) {
199199
var cm = editor._codeMirror;
200200
CodeMirror.commands.unfoldAll(cm);
201201
}
@@ -206,10 +206,10 @@ define(function (require, exports, module) {
206206
* @param {Editor} editor the editor on which to initialise the fold gutter
207207
*/
208208
function createGutter(editor) {
209-
var cm = editor._codeMirror;
210-
if (!cm) {
209+
if (!editor) {
211210
return;
212211
}
212+
var cm = editor._codeMirror;
213213
var path = editor.document.file.fullPath, _lineFolds = prefs.getFolds(path);
214214
_lineFolds = _lineFolds || {};
215215
cm._lineFolds = _lineFolds;
@@ -237,6 +237,18 @@ define(function (require, exports, module) {
237237
});
238238
}
239239

240+
/**
241+
* Remove the fold gutter for a given CodeMirror instance.
242+
* @param {CodeMirror} cm the CodeMirror instance whose gutter should be removed
243+
*/
244+
function removeGutter(cm) {
245+
var gutters = cm.getOption("gutters").slice(0);
246+
var index = gutters.indexOf(gutterName);
247+
gutters.splice(index, 1);
248+
cm.setOption("gutters", gutters);
249+
CodeMirror.defineOption("foldGutter", false, null);
250+
}
251+
240252
/**
241253
* Event handler to initialise fold-gutter and restores/saves line folds in editors whenever the active editor changes
242254
* @param {object} event the event object
@@ -255,7 +267,7 @@ define(function (require, exports, module) {
255267
} else {
256268
if (current && current._codeMirror) {
257269
CodeMirror.commands.unfoldAll(current._codeMirror);
258-
foldGutter.remove(current._codeMirror);
270+
removeGutter(current._codeMirror);
259271
}
260272
}
261273
}
@@ -389,10 +401,6 @@ define(function (require, exports, module) {
389401
return prefs.getSetting("alwaysUseIndentFold");
390402
}, indentFold);
391403

392-
CodeMirror.registerGlobalHelper("fold", "region", function (mode, cm) {
393-
return prefs.getSetting("enableRegionFolding");
394-
}, regionFold);
395-
396404
CodeMirror.registerHelper("fold", "django", CodeMirror.helpers.fold.brace);
397405
CodeMirror.registerHelper("fold", "tornado", CodeMirror.helpers.fold.brace);
398406

@@ -434,7 +442,7 @@ define(function (require, exports, module) {
434442
var editor = EditorManager.getCurrentFullEditor();
435443
if (editor && editor._codeMirror && CodeMirror.commands.unfoldAll) {
436444
CodeMirror.commands.unfoldAll(editor._codeMirror);
437-
foldGutter.remove(editor._codeMirror);
445+
removeGutter(editor._codeMirror);
438446
}
439447
removeMenuItems();
440448
}

‎src/nls/fi/strings.js‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -630,18 +630,7 @@ define({
630630
"COLLAPSE_ALL" : "Pienennä kaikki",
631631
"EXPAND_ALL" : "Laajenna kaikki",
632632
"COLLAPSE_CURRENT" : "Pienennä nykyinen",
633-
"EXPAND_CURRENT" : "Laajenna nykyinen",
634-
"MIN_FOLD_SIZE" : "Pienin laskostuksen koko",
635-
"MIN_FOLD_SIZE_HELP" : "Pienin sallittu laskostettavan alueen rivimäärä",
636-
"ENABLE_REGION_FOLDING" : "Ota mukautetun alueen laskostus käyttöön",
637-
"SAVE_FOLD_STATES" : "Tallenna laskosten tilat",
638-
"SAVE_FOLD_STATES_HELP" : "Tallenna laskosten tilat levylle, kun editori suljetaan ja palauta ne, kun editori avataan uudelleen",
639-
"ALWAYS_USE_INDENT_FOLD" : "Käytä aina sisennyslaskostusta",
640-
"ALWAYS_USE_INDENT_FOLD_HELP" : "Käytä aina sisennyksen tasoa laskostuksen ohjenuorana",
641-
"FADE_FOLD_BUTTONS" : "Häivytä laskostuspainikkeet",
642-
"FADE_FOLD_BUTTONS_HELP" : "Piilottaa laskostuspainikkeet, ellei osoitin ole sivumarginaalin päällä",
643-
"MAX_FOLD_LEVEL" : "Suurin sallittu sisäkkäisten laskosten määrä",
644-
"MAX_FOLD_LEVEL_HELP" : "Käytetään rajoittamaan sisäkkäisten laskosten määrää etsittäessä ja pienennettäessä, kun käytetään Näytä -> Pienennä kaikki \u2011komentoa tai kun Alt-näppäintä pidetään alhaalla pienennettäessä. Pitäisi parantaa suurten tiedostojen suorituskykyä."
633+
"EXPAND_CURRENT" : "Laajenna nykyinen"
645634
});
646635

647636
/* Last translated for eef9c68a1fdff372b9ea6352cacb5e2506e55be9 */

‎src/nls/nl/strings.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,6 @@ define({
461461
"COLLAPSE_ALL" : "Alles inklappen",
462462
"EXPAND_ALL" : "Alles uitklappen",
463463
"COLLAPSE_CURRENT" : "Huidige inklappen",
464-
"EXPAND_CURRENT" : "Huidige uitklappen",
465-
"MIN_FOLD_SIZE" : "Minimale vouwgrootte",
466-
"MIN_FOLD_SIZE_HELP" : "Minimaal aantal regels om toe te staan in een vouwreeks",
467-
"ENABLE_REGION_FOLDING" : "Aangepaste regio's inschakelen",
468-
"SAVE_FOLD_STATES" : "Vouwstatus bewaren",
469-
"SAVE_FOLD_STATES_HELP" : "Vouwstatus bewaren op schijf als editor gesloten wordt en herstellen wanneer opnieuw geopend",
470-
"ALWAYS_USE_INDENT_FOLD" : "Altijd vouwindentatie gebruiken",
471-
"ALWAYS_USE_INDENT_FOLD_HELP" : "Altijd het indentatieniveau als vouwrichtlijn gebruiken",
472-
"FADE_FOLD_BUTTONS" : "Vouwknoppen vervagen",
473-
"FADE_FOLD_BUTTONS_HELP" : "Verberg de vouwknoppen, behalve als de muis over de goot hangt"
464+
"EXPAND_CURRENT" : "Huidige uitklappen"
474465
});
475466
/* Last translated for 752856d58d2e9dde14e1af6be615bb7080727b7a */

‎src/nls/pt-br/strings.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -631,15 +631,6 @@ define({
631631
"COLLAPSE_ALL" : "Dobrar Tudo",
632632
"EXPAND_ALL" : "Expandir Tudo",
633633
"COLLAPSE_CURRENT" : "Dobrar Posição Atual",
634-
"EXPAND_CURRENT" : "Expandir Posição Atual",
635-
"MIN_FOLD_SIZE" : "Tamanha Mínimo",
636-
"MIN_FOLD_SIZE_HELP" : "Número Mínimo de linhas necessário para o dobramento",
637-
"ENABLE_REGION_FOLDING" : "Regiões Personalizadas de Dobramento",
638-
"SAVE_FOLD_STATES" : "Salvar Dobramentos",
639-
"SAVE_FOLD_STATES_HELP" : "Salva o estado atual das dobras quando o editor é fechado e as restaura quando aberto",
640-
"ALWAYS_USE_INDENT_FOLD" : "Sempre Usar Dobramento por Indentação",
641-
"ALWAYS_USE_INDENT_FOLD_HELP" : "Usa a Indentação como guia para o Dobramento",
642-
"FADE_FOLD_BUTTONS" : "Ocultar os botões de Dobramento",
643-
"FADE_FOLD_BUTTONS_HELP" : "Oculta os botões quando o cursor não está sobre eles"
634+
"EXPAND_CURRENT" : "Expandir Posição Atual"
644635
});
645636
/* Last translated for 0b949dd02b87866d54f38631715a4353a8f927e5 */

‎src/nls/root/strings.js‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -632,20 +632,8 @@ define({
632632
"DOCS_MORE_LINK" : "Read more",
633633

634634
// extensions/default/CodeFolding
635-
"ENABLE_CODE_FOLDING" : "Enable code folding",
636635
"COLLAPSE_ALL" : "Collapse All",
637636
"EXPAND_ALL" : "Expand All",
638637
"COLLAPSE_CURRENT" : "Collapse Current",
639-
"EXPAND_CURRENT" : "Expand Current",
640-
"MIN_FOLD_SIZE" : "Minimum fold size",
641-
"MIN_FOLD_SIZE_HELP" : "Minimum number of lines to allow in a fold range",
642-
"ENABLE_REGION_FOLDING" : "Enable custom region folding",
643-
"SAVE_FOLD_STATES" : "Save fold states",
644-
"SAVE_FOLD_STATES_HELP" : "Save fold states to disk when editor is closed and restore the folds when reopened",
645-
"ALWAYS_USE_INDENT_FOLD" : "Always use indent fold",
646-
"ALWAYS_USE_INDENT_FOLD_HELP" : "Always use level of indentation as a folding guideline",
647-
"FADE_FOLD_BUTTONS" : "Fade fold buttons",
648-
"FADE_FOLD_BUTTONS_HELP" : "Hides the fold buttons unless the mouse is over the gutter",
649-
"MAX_FOLD_LEVEL" : "Maximum number of nested folds",
650-
"MAX_FOLD_LEVEL_HELP" : "Used to limit the number of nested folds to find and collapse when View -> Collapse All is called or Alt is held down when collapsing. Should improve performance for large files."
638+
"EXPAND_CURRENT" : "Expand Current"
651639
});

0 commit comments

Comments
 (0)