From 8d1cdd9d746c7ed5b12bddaaa8eea116b42c21b8 Mon Sep 17 00:00:00 2001 From: Jordan Janzen Date: Mon, 23 Apr 2018 16:21:57 -0700 Subject: [PATCH 1/3] Remove wordWrap. --- .vscode/settings.json | 2 -- packages/experiments/.vscode/settings.json | 1 - 2 files changed, 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 150122e0197022..43eceaa00ef3a6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,8 +36,6 @@ "**/dist": true, "**/*.scss.ts": true }, - // Without this setting, editor.wordWrapColumn is not used. - "editor.wordWrap": "wordWrapColumn", // Controls after how many characters the editor will wrap to the next line. Setting this to 0 turns on viewport width wrapping "editor.wordWrapColumn": 140, "tslint.enable": true, diff --git a/packages/experiments/.vscode/settings.json b/packages/experiments/.vscode/settings.json index de0544e276ce5d..a47d61e2fb865a 100644 --- a/packages/experiments/.vscode/settings.json +++ b/packages/experiments/.vscode/settings.json @@ -28,7 +28,6 @@ "**/*.scss.ts": true }, // Controls after how many characters the editor will wrap to the next line. Setting this to 0 turns on viewport width wrapping - "editor.wordWrap": "wordWrapColumn", "editor.wordWrapColumn": 140, "tslint.enable": true, "tslint.rulesDirectory": "../../common/node_modules/tslint-microsoft-contrib", From 152d5abc315918b373d5c835070d8b8494bcdaa0 Mon Sep 17 00:00:00 2001 From: Jordan Janzen Date: Mon, 23 Apr 2018 16:25:31 -0700 Subject: [PATCH 2/3] changes --- .../fix-vscode-settings_2018-04-23-23-23.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json diff --git a/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json b/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json new file mode 100644 index 00000000000000..0a0db02370c327 --- /dev/null +++ b/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/experiments", + "comment": "Remove wordWrap setting.", + "type": "patch" + } + ], + "packageName": "@uifabric/experiments", + "email": "v-jojanz@microsoft.com" +} \ No newline at end of file From 0262aa11a4913d6c0b22cbad0442cbd9692092d7 Mon Sep 17 00:00:00 2001 From: Jordan Janzen Date: Mon, 23 Apr 2018 16:33:46 -0700 Subject: [PATCH 3/3] Update fix-vscode-settings_2018-04-23-23-23.json --- .../experiments/fix-vscode-settings_2018-04-23-23-23.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json b/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json index 0a0db02370c327..620ce8fd54fd95 100644 --- a/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json +++ b/common/changes/@uifabric/experiments/fix-vscode-settings_2018-04-23-23-23.json @@ -3,9 +3,9 @@ { "packageName": "@uifabric/experiments", "comment": "Remove wordWrap setting.", - "type": "patch" + "type": "none" } ], "packageName": "@uifabric/experiments", "email": "v-jojanz@microsoft.com" -} \ No newline at end of file +}