Skip to content

Commit 0b0705a

Browse files
tobil4skeprev
authored andcommitted
Improve merged file generation (HerringtonDarkholme#283)
* Generate typescriptcommon.vim merged file as well This is how vim is organised now. * Respect indentation when merging files * Avoid indenting empty lines * Regenerate merged files
1 parent be15451 commit 0b0705a

File tree

4 files changed

+4349
-2225
lines changed

4 files changed

+4349
-2225
lines changed

merge.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ var fs = require('fs')
22

33
var entry = fs.readFileSync('syntax/typescript.vim', 'utf8')
44
var entryReact = fs.readFileSync('syntax/typescriptreact.vim', 'utf8')
5+
var common = fs.readFileSync('syntax/common.vim', 'utf8')
56

6-
function replace(_, filename) {
7+
function replace(_, indentation, filename) {
78
var source = fs.readFileSync(filename, 'utf8')
8-
return importFile(source)
9+
return importFile(source.replace(/^(?!$)/gm, indentation))
910
}
1011

1112
function importFile(source) {
12-
return source.replace(/^\s*runtime (.+)?/gm, replace)
13+
return source.replace(/^([ \t]*)runtime (.+)?/gm, replace)
1314
}
1415

1516
var merged = importFile(entry)
1617
var mergedReact = importFile(entryReact)
18+
var mergedCommon = importFile(common)
1719
fs.writeFileSync('merged/typescript.vim', merged)
1820
fs.writeFileSync('merged/typescriptreact.vim', mergedReact)
21+
fs.writeFileSync('merged/typescriptcommon.vim', mergedCommon)

0 commit comments

Comments
 (0)