Line Numeberer Configuration Options

Author: mikecentola

package.json

@@ -253,6 +253,12 @@
                     "markdownDescription": "Ignore Blank Lines when Numbering",
                     "scope": "window"
                 },
+                "gcode.lineNumberer.ignoreComments": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "Ignore Comments when Numbering",
+                    "scope": "window"
+                },
                 "gcode.lineNumberer.ignoreProgramNumbers": {
                     "type": "boolean",
                     "default": true,

src/util/commands/addLineNumbers.ts

@@ -5,7 +5,8 @@
 
 'use strict';
 
-import { LineNumberer } from '../lineNumberer';
+import { configuration } from '../configuration/config';
+import { LineNumberer, LineNumbererOptions } from '../lineNumberer';
 import { LineNumbersInput } from '../quickpicks/lineNumbers';
 import { GCommand, UtilCommands } from './common';
 
@@ -18,7 +19,15 @@ export class AddLineNumbers extends GCommand {
         const lnInputs = new LineNumbersInput();
         const state = await lnInputs.collect();
 
+        const opts: LineNumbererOptions = {};
+
+        opts.addSpaceAfter = configuration.getParam('lineNumberer.addSpaceAfter');
+        opts.frequency = configuration.getParam('lineNumberer.frequency');
+        opts.ignoreBlank = configuration.getParam('lineNumberer.ignoreBlank');
+        opts.ignoreComments = configuration.getParam('lineNumberer.ignoreComments');
+        opts.ignoreProgramNumbers = configuration.getParam('lineNumberer.ignoreProgramNumbers');
+
         const ln = new LineNumberer();
-        await ln.addNumbers(state.start, state.increment, true);
+        await ln.addNumbers(state.start, state.increment, true, opts);
     }
 }

src/util/lineNumberer.ts

@@ -5,13 +5,14 @@
 'use strict';
 
 import { Progress, ProgressLocation, Range, TextEditor, window } from 'vscode';
+import { constants } from './constants';
 
 export enum LineNumberFrequency {
     EveryLine = 'Every Line',
     AtToolChanges = 'At Tool Changes',
 }
 
-type LineNumbererOptions = {
+export type LineNumbererOptions = {
     addSpaceAfter?: boolean;
     frequency?: LineNumberFrequency;
     ignoreComments?: boolean;
@@ -38,8 +39,18 @@ export class LineNumberer {
         showProgress: boolean,
         options?: LineNumbererOptions,
     ): Promise<boolean> {
-        if (this._editor && this._editor.document) {
-            this._beforeText = this._editor.document.getText();
+        if (
+            this._editor &&
+            this._editor.document &&
+            this._editor.document.uri.scheme === 'file' &&
+            this._editor.document.languageId === constants.langId
+        ) {
+            if (!this._editor.selection.isEmpty) {
+                const select = new Range(this._editor.selection.start, this._editor.selection.end);
+                this._beforeText = this._editor.document.getText(select);
+            } else {
+                this._beforeText = this._editor.document.getText();
+            }
         }
         // Remove any numbers first
         const newtext = this._removeNumbers(this._beforeText);
@@ -171,9 +182,20 @@ export class LineNumberer {
     }
 
     async removeNumbers(showProgress: boolean = false): Promise<boolean> {
-        if (this._editor && this._editor.document) {
-            this._beforeText = this._editor.document.getText();
+        if (
+            this._editor &&
+            this._editor.document &&
+            this._editor.document.uri.scheme === 'file' &&
+            this._editor.document.languageId === constants.langId
+        ) {
+            if (!this._editor.selection.isEmpty) {
+                const select = new Range(this._editor.selection.start, this._editor.selection.end);
+                this._beforeText = this._editor.document.getText(select);
+            } else {
+                this._beforeText = this._editor.document.getText();
+            }
         }
+
         if (showProgress) {
             await window.withProgress(
                 {
@@ -209,14 +231,19 @@ export class LineNumberer {
     private async _updateTextEditor(text: string): Promise<boolean> {
         const len = this._beforeText.length;
 
+        let rng: Range;
+
         if (this._editor && this._editor.document) {
+            if (!this._editor.selection.isEmpty) {
+                rng = new Range(this._editor.selection.start, this._editor.selection.end);
+            } else {
+                rng = new Range(this._editor.document.positionAt(0), this._editor.document.positionAt(len - 1));
+            }
+
             return Promise.resolve(
                 this._editor.edit(editBuilder => {
                     if (this._editor && this._editor.document) {
-                        editBuilder.replace(
-                            new Range(this._editor.document.positionAt(0), this._editor.document.positionAt(len - 1)),
-                            text,
-                        );
+                        editBuilder.replace(rng, text);
 
                         this._beforeText = '';
                     }