Skip to content

Commit aea1b42

Browse files
committed
Added new lineNumberer config options
1 parent 8e260e2 commit aea1b42

File tree

3 files changed

+46
-9
lines changed

3 files changed

+46
-9
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,24 @@
239239
"markdownDescription": "Add Space After Line Number",
240240
"scope": "window"
241241
},
242+
"gcode.lineNumberer.defaultIncrement": {
243+
"type": "number",
244+
"default": 10,
245+
"markdownDescription": "Default Line Numberer Increment",
246+
"scope": "window"
247+
},
248+
"gcode.lineNumberer.defaultStart": {
249+
"type": "number",
250+
"default": 10,
251+
"markdownDescription": "Default Line Numberer Start",
252+
"scope": "window"
253+
},
254+
"gcode.lineNumbere.enableQuickPick": {
255+
"type": "boolean",
256+
"default": true,
257+
"markdownDescription": "Enable or Disable Input for Line Numberer (Will use above defaults).",
258+
"scope": "window"
259+
},
242260
"gcode.lineNumberer.frequency": {
243261
"type": "string",
244262
"default": "Every Line",
@@ -264,12 +282,29 @@
264282
"markdownDescription": "Ignore Comments when Numbering",
265283
"scope": "window"
266284
},
285+
"gcode.lineNumberer.ignoreExtra": {
286+
"type": "array",
287+
"items": {
288+
"type": "string"
289+
},
290+
"default": [
291+
"%"
292+
],
293+
"markdownDescription": "Additional characters to ignore (Beginning of Line)",
294+
"scope": "window"
295+
},
267296
"gcode.lineNumberer.ignoreProgramNumbers": {
268297
"type": "boolean",
269298
"default": true,
270299
"markdownDescription": "Ignore program numbers, e.g. `O12345`",
271300
"scope": "window"
272301
},
302+
"gcode.lineNumberer.matchLineNumber": {
303+
"type": "boolean",
304+
"default": false,
305+
"markdownDescription": "When numbering, match N number to file's line number.",
306+
"scope": "window"
307+
},
273308
"gcode.views.maxAutoRefresh": {
274309
"type": "integer",
275310
"default": "10000",

src/util/configuration/defaults.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { StatusBarAlignment } from 'vscode';
99
import { GCodeUnits } from '../../gcodeUnits';
10-
import { LineNumberFrequency } from '../lineNumberer';
10+
import { LineNumbererOptions, LineNumberFrequency } from '../lineNumberer';
1111

1212
export enum TraceLevel {
1313
Silent = 'silent',
@@ -35,12 +35,7 @@ export interface GCodeConfiguration {
3535
outputLevel: TraceLevel;
3636
};
3737

38-
lineNumberer: {
39-
addSpaceAfter: boolean;
40-
frequency: LineNumberFrequency;
41-
ignoreBlank: boolean;
42-
ignoreProgramNumbers: boolean;
43-
};
38+
lineNumberer: LineNumbererOptions;
4439

4540
views: {
4641
maxAutoRefresh: number;
@@ -74,9 +69,16 @@ export const defaults: GCodeConfiguration = {
7469
},
7570
lineNumberer: {
7671
addSpaceAfter: true,
72+
defaultIncrement: 10,
73+
defaultStart: 10,
74+
enableQuickPick: true,
7775
frequency: LineNumberFrequency.EveryLine,
7876
ignoreBlank: true,
77+
ignoreComments: true,
78+
ignoreExtra: [],
7979
ignoreProgramNumbers: true,
80+
matchLineNumber: false,
81+
showProgress: true,
8082
},
8183
views: {
8284
maxAutoRefresh: 10000,

0 commit comments

Comments
 (0)