Skip to content

Commit

Permalink
VSCode: add files.eol setting to avoid CRLF on Windows.
Browse files Browse the repository at this point in the history
This is also moving all the "truly optionals" settings at the end.

Bug: none
Change-Id: I4a030e72736f640b59a644223485f232808e808d
Reviewed-on: https://chromium-review.googlesource.com/c/1405248
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#621710}
  • Loading branch information
mounirlamouri authored and Commit Bot committed Jan 10, 2019
1 parent 977e61b commit b945b3b
Showing 1 changed file with 20 additions and 18 deletions.
38 changes: 20 additions & 18 deletions tools/vscode/settings.json5
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Suggested vscode default settings for simplifying initial setup. These
// settings are hoped to be convenient and helpful for those beginning to use
// vscode with Chrome. Please modify and change as necessary.
// All settings are optional, but some more "optional" settings are disabled
// by default. Feel free to enable them.
// All settings are optional, but some more "optional" settings at the end
// are disabled by default. Feel free to enable them.

// Default tab size of 2, for consistency with internal codebase.
"editor.tabSize": 2,
Expand All @@ -13,22 +13,8 @@
"editor.rulers": [80],
// Trim tailing whitespace on save.
"files.trimTrailingWhitespace": true,

// Optional: Highlight current line at the left of the editor.
// "editor.renderLineHighlight": "gutter",
// Optional: Don't automatically add closing brackets. It gets in the way.
// "editor.autoClosingBrackets": false,
// Optional: Enable a tiny 30k feet view of your doc.
// "editor.minimap.enabled": true,
// "editor.minimap.maxColumn": 80,
// "editor.minimap.renderCharacters": false,
// Optional: Don't continuously fetch remote changes.
//"git.autofetch": false,
// Optional: Do not open files in 'preview' mode. Opening a new file in can
// replace an existing one in preview mode, which can be confusing.
//"workbench.editor.enablePreview": false,
// Optional: Same for files opened from quick open (Ctrl+P).
//"workbench.editor.enablePreviewFromQuickOpen": false,
// Forces LF instead of "auto" which uses CRLF on Windows.
"files.eol": "\n",

"files.associations": {
// Adds xml syntax highlighting for grd files.
Expand Down Expand Up @@ -67,5 +53,21 @@
"ycmd.path": "<full_path_to_your_home>/.ycmd", // Please replace this path
"ycmd.global_extra_config": "${workspaceRoot}/tools/vim/chromium.ycm_extra_conf.py",
"ycmd.confirm_extra_conf": false,

// Optional: Highlight current line at the left of the editor.
// "editor.renderLineHighlight": "gutter",
// Optional: Don't automatically add closing brackets. It gets in the way.
// "editor.autoClosingBrackets": false,
// Optional: Enable a tiny 30k feet view of your doc.
// "editor.minimap.enabled": true,
// "editor.minimap.maxColumn": 80,
// "editor.minimap.renderCharacters": false,
// Optional: Don't continuously fetch remote changes.
//"git.autofetch": false,
// Optional: Do not open files in 'preview' mode. Opening a new file in can
// replace an existing one in preview mode, which can be confusing.
//"workbench.editor.enablePreview": false,
// Optional: Same for files opened from quick open (Ctrl+P).
//"workbench.editor.enablePreviewFromQuickOpen": false,
}

0 comments on commit b945b3b

Please sign in to comment.