Skip to content

Commit

Permalink
Remove fix-whitespace gulp command. Replaced by .vscode/settings.json (
Browse files Browse the repository at this point in the history
  • Loading branch information
jpoon authored Oct 27, 2016
1 parent e473341 commit 9199e31
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 28 deletions.
19 changes: 8 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.trimTrailingWhitespace": true,
"files.exclude": {
"out": false // set this to true to hide the "out" folder with the compiled JS files
},
"search.exclude": {
"out": true // set this to false to include "out" folder in search results
},
"vim.insertModeKeyBindings": [
{
"before": ["j", "j"],
"after": ["<esc>"]
}
],

"vim.hlsearch": false,
"editor.cursorStyle": "block",

"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
"editor.tabSize": 2,
"editor.insertSpaces": true,
"vim.useCtrlKeys": true,
"files.trimTrailingWhitespace": true
"vim.hlsearch": false,
"vim.insertModeKeyBindings": [
{
"before": ["j", "j"],
"after": ["<esc>"]
}
]
}
17 changes: 2 additions & 15 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ var gulp = require('gulp'),
inject = require('gulp-inject-string'),
merge = require('merge-stream'),
tag_version = require('gulp-tag-version'),
trimlines = require('gulp-trimlines'),
tslint = require('gulp-tslint'),
typings = require('gulp-typings'),
shell = require('gulp-shell'),
soften = require('gulp-soften');
shell = require('gulp-shell');

var paths = {
src_ts: "src/**/*.ts",
Expand Down Expand Up @@ -40,18 +38,7 @@ gulp.task('typings-vscode-definitions', ['typings'], function() {
.pipe(gulp.dest('./typings'));
})

gulp.task('fix-whitespace', function() {
// 1. change tabs to spaces
// 2. trim trailing whitespace
return gulp.src([paths.src_ts, paths.tests_ts], { base: "./" })
.pipe(soften(2))
.pipe(trimlines({
leading: false
}))
.pipe(gulp.dest('./'));
});

gulp.task('tslint', ['fix-whitespace'], function() {
gulp.task('tslint', function() {
var tslintOptions = {
summarizeFailureOutput: true
};
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,7 @@
"gulp-git": "^1.7.1",
"gulp-inject-string": "^1.1.0",
"gulp-shell": "^0.5.2",
"gulp-soften": "^0.0.1",
"gulp-tag-version": "^1.3.0",
"gulp-trimlines": "^1.0.0",
"gulp-tslint": "^6.1.2",
"gulp-typings": "^2.0.0",
"merge-stream": "^1.0.0",
Expand Down

0 comments on commit 9199e31

Please sign in to comment.