From 3bdd28f3237808c166a84a95d2539b3e07ec11c1 Mon Sep 17 00:00:00 2001
From: OctoD <iamoctod@gmail.com>
Date: Mon, 22 May 2017 09:54:30 +0200
Subject: [PATCH 1/2] chore: dumps .editorconfig and moves settings to
 settings.json

---
 .editorconfig         | 16 ----------------
 .vscode/settings.json | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index c6e3992..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{py,sublime-project}]
-indent_size = 4
-
-[*.md]
-trim_trailing_whitespace = false
-indent_size = 4
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 73469f8..5d257d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,29 @@
 {
-  "vsicons.presets.angular": false,
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "node_modules": true,
+    "**/*.js": {
+      "when": "$(basename).ts"
+    }
+  },
   "files.associations": {
     "*.template": "json"
+  },
+  "html.format.preserveNewLines": true,
+  "files.trimTrailingWhitespace": true,
+  "[python]": {
+    "editor.tabSize": 4
+  },
+  "[markdown]": {
+    "diffEditor.ignoreTrimWhitespace": false,
+    "editor.tabSize": 4,
+    "editor.wordWrap": "on",
+    "editor.quickSuggestions": false
   }
 }
\ No newline at end of file

From 6436b6c1851d477ec3ac89fd92aa309c0a89cc1e Mon Sep 17 00:00:00 2001
From: OctoD <iamoctod@gmail.com>
Date: Mon, 22 May 2017 10:24:23 +0200
Subject: [PATCH 2/2] chore: Added .log files to ignore list

---
 .gitignore    |  6 ++++--
 .vscodeignore | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04c01ba..fd5ee6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-node_modules/
-dist/
\ No newline at end of file
+*.log
+*.~lock
+dist/
+node_modules/
\ No newline at end of file
diff --git a/.vscodeignore b/.vscodeignore
index 1f4b4b5..a6adf7f 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -1,15 +1,16 @@
-assets/
-.vscode/**
-typings/**
-out/test/**
-test/**
-src/**
+*.log
 **/*.map
-.gulp
 .github
 .gitignore
-tsconfig.json
-vsc-extension-quickstart.md
-node_modules
+.gulp
+.vscode/**
+assets/
 gulpfile.babel.json
+node_modules
+out/test/**
+src/**
+test/**
+tsconfig.json
+typings/**
+vsc-extension-quickstart.md
 yarn.lock
\ No newline at end of file