File tree Expand file tree Collapse file tree 4 files changed +23
-4
lines changed Expand file tree Collapse file tree 4 files changed +23
-4
lines changed Original file line number Diff line number Diff line change 1
- var vscode = require ( "vscode" )
1
+ var vscode = require ( "vscode" ) ;
2
+ var env = require ( './env' ) ;
2
3
var editorHelpers = require ( "./editorHelpers" ) ;
3
4
var tables = require ( "./tables" ) ;
4
5
@@ -67,7 +68,8 @@ function toggleStrikethrough() {
67
68
return editorHelpers . surroundSelection ( '~~' , '~~' , toggleStrikethroughPattern ) ;
68
69
}
69
70
70
- var newLine = vscode . workspace . getConfiguration ( 'files' ) . get ( 'eol' , '\r\n' ) ;
71
+ let newLine = env . getEol ( ) ;
72
+
71
73
var startingBlock = '```' + newLine ;
72
74
var endingBlock = newLine + '```' ;
73
75
var codeBlockWordPattern = new RegExp ( startingBlock + '.+' + endingBlock + '|.+' , 'gm' ) ;
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change 13
13
],
14
14
"keywords" : [
15
15
" markdown" ,
16
- " shortcut"
16
+ " shortcut" ,
17
+ " tool" ,
18
+ " helper"
17
19
],
18
20
"main" : " ./extension" ,
19
21
"activationEvents" : [
Original file line number Diff line number Diff line change 3
3
var assert = require ( 'assert' ) ;
4
4
var vscode = require ( 'vscode' ) ;
5
5
var vscodeTestContent = require ( 'vscode-test-content' ) ;
6
+ var env = require ( '../lib/env' ) ;
6
7
7
8
suite ( "Bold" , function ( ) {
8
9
test ( "Ranged selection" , function ( ) {
@@ -141,7 +142,7 @@ suite( "Headers", function() {
141
142
}
142
143
} ) ;
143
144
144
- var newLine = vscode . workspace . getConfiguration ( 'files' ) . get ( 'eol' , '\n' ) ;
145
+ var newLine = env . getEol ( ) ;
145
146
suite ( "Block code" , function ( ) {
146
147
test ( "Ranged selection" , function ( ) {
147
148
return TestCommand (
You can’t perform that action at this time.
0 commit comments