Skip to content

Commit 94b5283

Browse files
committed
Handle files.eol option of "auto"
Resolves #45
1 parent 4de8169 commit 94b5283

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

lib/commands.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
var vscode = require("vscode")
1+
var vscode = require("vscode");
2+
var env = require('./env');
23
var editorHelpers = require("./editorHelpers");
34
var tables = require("./tables");
45

@@ -67,7 +68,8 @@ function toggleStrikethrough() {
6768
return editorHelpers.surroundSelection('~~', '~~', toggleStrikethroughPattern);
6869
}
6970

70-
var newLine = vscode.workspace.getConfiguration('files').get('eol', '\r\n');
71+
let newLine = env.getEol();
72+
7173
var startingBlock = '```' + newLine;
7274
var endingBlock = newLine + '```';
7375
var codeBlockWordPattern = new RegExp(startingBlock + '.+' + endingBlock + '|.+', 'gm');

lib/env.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const os = require('os');
2+
const vscode = require('vscode');
3+
4+
function getEol() {
5+
const newLineSetting = vscode.workspace.getConfiguration('files', null).get('eol');
6+
let newLine = os.EOL;
7+
if (newLineSetting === '\n' || newLineSetting === '\r\n') newLine = newLineSetting;
8+
9+
return newLine;
10+
}
11+
12+
module.exports = {
13+
getEol: getEol
14+
}

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
],
1414
"keywords": [
1515
"markdown",
16-
"shortcut"
16+
"shortcut",
17+
"tool",
18+
"helper"
1719
],
1820
"main": "./extension",
1921
"activationEvents": [

test/extension.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
var assert = require( 'assert' );
44
var vscode = require( 'vscode' );
55
var vscodeTestContent = require( 'vscode-test-content' );
6+
var env = require('../lib/env');
67

78
suite( "Bold", function() {
89
test( "Ranged selection", function() {
@@ -141,7 +142,7 @@ suite( "Headers", function() {
141142
}
142143
} );
143144

144-
var newLine = vscode.workspace.getConfiguration('files').get('eol', '\n');
145+
var newLine = env.getEol();
145146
suite( "Block code", function() {
146147
test( "Ranged selection", function() {
147148
return TestCommand(

0 commit comments

Comments
 (0)