From fd250a8025dccf5520290982afaa52ef03bc1f70 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Tue, 2 Jun 2020 15:59:54 +0300 Subject: [PATCH] minor refactroing... Signed-off-by: Alex A. Naanou --- README.md | 6 +++--- object.js | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5ec154e..fe4114a 100755 --- a/README.md +++ b/README.md @@ -804,7 +804,7 @@ Align _code_ to shortest leading white-space ``` normalizeIndent() normalizeIndent(, ) -normalizeIndent(, , ) +normalizeIndent(, , ) -> ``` @@ -813,7 +813,7 @@ to make source printing in console more pleasant to read. `tab_size` defaults to `object.TAB_SIZE` -`keep_indent` defaults to `object.KEEP_INDENT` +`leading_tabs` defaults to `object.LEADING_TABS` A shorthand to `normalizeIndent(..)` optimized for text rather than code @@ -822,7 +822,7 @@ normalizeTextIndent(..) -> ``` -This ignores `object.KEEP_INDENT` and `keep_indent` is 0 by default. +This ignores `object.LEADING_TABS` and `leading_tabs` is 0 by default. ### `match(..)` diff --git a/object.js b/object.js index 8fd15e0..a2b49a8 100755 --- a/object.js +++ b/object.js @@ -25,8 +25,8 @@ var TAB_SIZE = module.TAB_SIZE = 4 -var KEEP_INDENT = -module.KEEP_INDENT = 1 +var LEADING_TABS = +module.LEADING_TABS = 1 // Normalize code indent... @@ -42,8 +42,8 @@ module.KEEP_INDENT = 1 // This will ignore the indent of the first line. // // If the last line is indented higher or equal to the rest of the text -// we will user keep_indent (defaults to KEEP_INDENT) to indent the rest -// of the text. +// we will user leading_tabs (defaults to LEADING_TABS) to indent the +// rest of the text. // This will indent the following styles correctnly: // // |function(a, b){ |function(a, b){ @@ -56,13 +56,13 @@ module.KEEP_INDENT = 1 // ...when moving take care that ImageGrid's core.doc uses this... var normalizeIndent = module.normalizeIndent = -function(text, tab_size, keep_indent){ +function(text, tab_size, leading_tabs){ tab_size = tab_size == null ? TAB_SIZE : tab_size - keep_indent = (keep_indent == null ? - KEEP_INDENT - : keep_indent) + leading_tabs = (leading_tabs == null ? + LEADING_TABS + : leading_tabs) * tab_size // prepare text... var tab = ' '.repeat(tab_size) @@ -78,9 +78,9 @@ function(text, tab_size, keep_indent){ // ignore 0 indent of first line... || (i == 0 && indent == 0) ? l - // last line -- ignore keep_indent if lower indent... + // last line -- ignore leading_tabs if lower indent... : i == lines.length-1 && indent > l ? - Math.max(l-keep_indent, 0) + Math.max(l-leading_tabs, 0) // initial state... : l < 0 ? indent @@ -99,8 +99,8 @@ function(text, tab_size, keep_indent){ // shorthand more suted for text... var normalizeTextIndent = module.normalizeTextIndent = -function(text, tab_size, keep_indent){ - return module.normalizeIndent(text, tab_size, keep_indent || 0) } +function(text, tab_size, leading_tabs){ + return module.normalizeIndent(text, tab_size, leading_tabs || 0) } // Match two objects...