1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 02:17:59 +01:00

fix whitespace formatting - remove leading tab characters with :retab

This commit is contained in:
Doug Kearns
2007-08-17 16:40:06 +00:00
parent dd14513fa2
commit 3efc83341c
4 changed files with 100 additions and 100 deletions

View File

@@ -473,11 +473,11 @@ vimperator.completion = (function() // {{{
if (command && command.completer) if (command && command.completer)
{ {
completions = command.completer.call(this, args); completions = command.completer.call(this, args);
// if (command[0][0] == "open" || // if (command[0][0] == "open" ||
// command[0][0] == "tabopen" || // command[0][0] == "tabopen" ||
// command[0][0] == "winopen") // command[0][0] == "winopen")
// start = str.search(/^:*\d*\w+(\s+|.*\|)/); // up to the last | or the first space // start = str.search(/^:*\d*\w+(\s+|.*\|)/); // up to the last | or the first space
// else // else
matches = str.match(/^:*\d*\w+\s+/); // up to the first spaces only matches = str.match(/^:*\d*\w+\s+/); // up to the first spaces only
start = matches[0].length; start = matches[0].length;
} }

View File

@@ -12,7 +12,7 @@ for the specific language governing rights and limitations under the
License. License.
(c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net> (c) 2006-2007: Martin Stubenschrott <stubenschrott@gmx.net>
Code based on venkman Code based on venkman
Alternatively, the contents of this file may be used under the terms of Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or either the GNU General Public License Version 2 or later (the "GPL"), or

View File

@@ -92,93 +92,93 @@ function highlightFind(str, color, wrapped, dir, pt)
alert('gWin does not exist here...'); alert('gWin does not exist here...');
alert(vimperator.search.gWin); alert(vimperator.search.gWin);
} }
var doc = gWin.document; var doc = gWin.document;
var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"].createInstance() var finder = Components.classes["@mozilla.org/embedcomp/rangefind;1"].createInstance()
.QueryInterface(Components.interfaces.nsIFind); .QueryInterface(Components.interfaces.nsIFind);
var searchRange; var searchRange;
var startPt; var startPt;
var endPt; var endPt;
var body = doc.body; var body = doc.body;
finder.findBackwards = !dir; finder.findBackwards = !dir;
searchRange = doc.createRange(); searchRange = doc.createRange();
startPt = doc.createRange(); startPt = doc.createRange();
endPt = doc.createRange(); endPt = doc.createRange();
var count = body.childNodes.length; var count = body.childNodes.length;
// Search range in the doc // Search range in the doc
searchRange.setStart(body,0); searchRange.setStart(body,0);
searchRange.setEnd(body, count); searchRange.setEnd(body, count);
if (!dir) { if (!dir) {
if (pt == null) { if (pt == null) {
startPt.setStart(body, count); startPt.setStart(body, count);
startPt.setEnd(body, count); startPt.setEnd(body, count);
} else { } else {
startPt.setStart(pt.startContainer, pt.startOffset); startPt.setStart(pt.startContainer, pt.startOffset);
startPt.setEnd(pt.startContainer, pt.startOffset); startPt.setEnd(pt.startContainer, pt.startOffset);
} }
endPt.setStart(body, 0); endPt.setStart(body, 0);
endPt.setEnd(body, 0); endPt.setEnd(body, 0);
} else { } else {
if (pt == null) { if (pt == null) {
startPt.setStart(body, 0); startPt.setStart(body, 0);
startPt.setEnd(body, 0); startPt.setEnd(body, 0);
} else { } else {
startPt.setStart(pt.endContainer, pt.endOffset); startPt.setStart(pt.endContainer, pt.endOffset);
startPt.setEnd(pt.endContainer, pt.endOffset); startPt.setEnd(pt.endContainer, pt.endOffset);
} }
endPt.setStart(body, count); endPt.setStart(body, count);
endPt.setEnd(body, count); endPt.setEnd(body, count);
} }
// search the doc // search the doc
var retRange = null; var retRange = null;
var selectionRange = null; var selectionRange = null;
if (!wrapped) { if (!wrapped) {
do { do {
retRange = finder.Find(str, searchRange, startPt, endPt); retRange = finder.Find(str, searchRange, startPt, endPt);
var keepSearching = false; var keepSearching = false;
if (retRange) { if (retRange) {
var sc = retRange.startContainer; var sc = retRange.startContainer;
var ec = retRange.endContainer; var ec = retRange.endContainer;
var scp = sc.parentNode; var scp = sc.parentNode;
var ecp = ec.parentNode; var ecp = ec.parentNode;
var sy1 = abs_point(scp).y; var sy1 = abs_point(scp).y;
var ey2 = abs_point(ecp).y + ecp.offsetHeight; var ey2 = abs_point(ecp).y + ecp.offsetHeight;
startPt = retRange.startContainer.ownerDocument.createRange(); startPt = retRange.startContainer.ownerDocument.createRange();
if (!dir) { if (!dir) {
startPt.setStart(retRange.startContainer, retRange.startOffset); startPt.setStart(retRange.startContainer, retRange.startOffset);
startPt.setEnd(retRange.startContainer, retRange.startOffset); startPt.setEnd(retRange.startContainer, retRange.startOffset);
} else { } else {
startPt.setStart(retRange.endContainer, retRange.endOffset); startPt.setStart(retRange.endContainer, retRange.endOffset);
startPt.setEnd(retRange.endContainer, retRange.endOffset); startPt.setEnd(retRange.endContainer, retRange.endOffset);
} }
// We want to find a match that is completely // We want to find a match that is completely
// visible, otherwise the view will scroll just a // visible, otherwise the view will scroll just a
// bit to fit the selection in completely. // bit to fit the selection in completely.
// alert ("sy1: " + sy1 + " scry: " + gWin.scrollY); // alert ("sy1: " + sy1 + " scry: " + gWin.scrollY);
// alert ("ey2: " + ey2 + " bot: " + (gWin.scrollY + gWin.innerHeight)); // alert ("ey2: " + ey2 + " bot: " + (gWin.scrollY + gWin.innerHeight));
keepSearching = (dir && sy1 < gWin.scrollY) keepSearching = (dir && sy1 < gWin.scrollY)
|| (!dir && ey2 >= gWin.scrollY + gWin.innerHeight); || (!dir && ey2 >= gWin.scrollY + gWin.innerHeight);
} }
} while (retRange && keepSearching); } while (retRange && keepSearching);
} else { } else {
retRange = finder.Find(str, searchRange, startPt, endPt); retRange = finder.Find(str, searchRange, startPt, endPt);
} }
if (retRange) { if (retRange) {
setSelection(retRange); setSelection(retRange);
selectionRange = retRange.cloneRange(); selectionRange = retRange.cloneRange();
// highlightAllBut(str, retRange, color); // highlightAllBut(str, retRange, color);
} else { } else {
} }
return selectionRange; return selectionRange;
} catch(e) { alert('highlightFind:'+e); } } catch(e) { alert('highlightFind:'+e); }
} }
@@ -188,19 +188,19 @@ function clearHighlight()
var win = window.content; var win = window.content;
var doc = win.document; var doc = win.document;
if (!document) if (!document)
return; return;
var elem = null; var elem = null;
while ((elem = doc.getElementById("__vimperator-findbar-search-id"))) { while ((elem = doc.getElementById("__vimperator-findbar-search-id"))) {
var child = null; var child = null;
var docfrag = doc.createDocumentFragment(); var docfrag = doc.createDocumentFragment();
var next = elem.nextSibling; var next = elem.nextSibling;
var parent = elem.parentNode; var parent = elem.parentNode;
while ((child = elem.firstChild)) { while ((child = elem.firstChild)) {
docfrag.appendChild(child); docfrag.appendChild(child);
} }
parent.removeChild(elem); parent.removeChild(elem);
parent.insertBefore(docfrag, next); parent.insertBefore(docfrag, next);
} }
} }

View File

@@ -28,9 +28,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
const vimperator = (function() //{{{ const vimperator = (function() //{{{
{ {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
////////////////////// PRIVATE SECTION ///////////////////////////////////////// ////////////////////// PRIVATE SECTION /////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
const RC_FILE = "~/.vimperatorrc"; const RC_FILE = "~/.vimperatorrc";
const PLUGIN_DIR = "~/.vimperator/plugin"; const PLUGIN_DIR = "~/.vimperator/plugin";
@@ -70,7 +70,7 @@ const vimperator = (function() //{{{
var mode = modes.NORMAL; var mode = modes.NORMAL;
var extended_mode = modes.NONE; var extended_mode = modes.NONE;
var callbacks = []; var callbacks = [];
// our services // our services
var sound_service = Components.classes['@mozilla.org/sound;1'] var sound_service = Components.classes['@mozilla.org/sound;1']
@@ -145,9 +145,9 @@ const vimperator = (function() //{{{
return path; return path;
} }
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
return { return {