Skip to content

Add options to align using tab instead of spaces #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vageskar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add options to align using tab instead of spaces #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fd0b39
Add new configuration properies and add calculation for aligning with…
Apr 19, 2022
b66f31f
Fix bug in _getTabCount
Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions extension.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ function activate(context) {

aligner.minSeparationLeft = vscode.workspace.getConfiguration().get('autoalign.minSeparationLeft');
aligner.separationRight = vscode.workspace.getConfiguration().get('autoalign.separationRight');
aligner.minSeparationTabLeft = vscode.workspace.getConfiguration().get('autoalign.minSeparationTabLeft');
aligner.minSeparationTabRight = vscode.workspace.getConfiguration().get('autoalign.minSeparationTabRight');
aligner.columnWidth = vscode.workspace.getConfiguration().get('autoalign.columnWidth');
aligner.useTab = vscode.workspace.getConfiguration().get('autoalign.useTabs');
aligner.tabSize = vscode.workspace.getConfiguration().get('editor.tabSize') || 1;
let editor = vscode.window.activeTextEditor;
let selections = editor.selections; // handle multiple selections the same

Expand Down Expand Up @@ -114,7 +118,11 @@ class Aligner {
this.skippableEndingItemsArray = [];
this.minSeparationLeft = 3;
this.minSeparationRight = 1;
this.minSeparationTabLeft = 1;
this.minSeparationTabRight = 0;
this.columnWidth = undefined;
this.useTab = false;
this.tabSize = undefined;
}
align(text) {
if (!text) {
Expand Down Expand Up @@ -148,13 +156,13 @@ class Aligner {
let whiteAtEndCount = (unTrimmedLength - trimmendLength);

// we need to make sure it is the "minimumLeft" white-space
if (whiteAtEndCount < this.minSeparationLeft) {
if (!this.useTab && whiteAtEndCount < this.minSeparationLeft) {
let addAtEndCount = this.minSeparationLeft - whiteAtEndCount;
farthestAlignablePosition += addAtEndCount;
}

// NEAREST FACTOR OF
if (this.columnWidth > 1 && farthestAlignablePosition % this.columnWidth) {
if (!this.useTab && this.columnWidth > 1 && farthestAlignablePosition % this.columnWidth) {
let numberOfWholeColumns = ~~(farthestAlignablePosition / this.columnWidth);
farthestAlignablePosition = (numberOfWholeColumns + 1) * this.columnWidth;
}
Expand Down Expand Up @@ -183,11 +191,29 @@ class Aligner {
// create parts
let leftLine = line.substr(0, moveable.position).trimRight();
let rightLine = line.substr(moveable.position + moveable.item.length).trim();
let leftInsertString = ' '.repeat(position - leftLine.length);
let rightInsertString = ' '.repeat(Math.max(this.minSeparationRight, 1));

let leftInsertString = '';
let rightInsertString = '';

if (this.useTab) {
let tabs = this._getTabCount(position, leftLine);

leftInsertString = '\t'.repeat(tabs + this.minSeparationTabLeft);
rightInsertString = ' ' + '\t'.repeat(this.minSeparationTabRight);

} else {
leftInsertString = ' '.repeat(position - leftLine.length);
rightInsertString = ' '.repeat(Math.max(this.minSeparationRight, 1));
}

return leftLine + leftInsertString + moveable.item + rightInsertString + rightLine;
}
_getTabCount(position, line) {
let closestpos = Math.ceil(position / this.tabSize) * this.tabSize;
let wholeTabs = ~~((closestpos - line.length) / this.tabSize);
let partialTabs = (closestpos - (line.length + (wholeTabs * this.tabSize))) % this.tabSize == 0 ? 0 : 1;
return wholeTabs + partialTabs;
}

_getAlignablePositionAndItem(line) {
let reply = {
position : -1,
Expand Down
15 changes: 15 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@
"configuration": [{
"title": "Auto-Align Configuration",
"properties": {
"autoalign.useTabs": {
"type": "boolean",
"default": true,
"description": "Use TAB to allign items instead of spaces"
},
"autoalign.minSeparationTabLeft": {
"type": "number",
"default": 1,
"description": "Minimum number of tabs to the left of the aligned items"
},
"autoalign.minSeparationTabRight": {
"type": "number",
"default": 0,
"description": "Minimum number of tabs to the right of the aligned items"
},
"autoalign.moveableItems": {
"type": "array",
"default": [
Expand Down