Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EditorConfig Support #5932

Merged
merged 25 commits into from
Aug 20, 2020
Merged

EditorConfig Support #5932

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
11a34ab
EditorConfig WIP
tarik-brown Jul 28, 2020
3fd344d
Editorconfig Progress
tarik-brown Jul 30, 2020
b942704
Add support for ontype and range formatting
tarik-brown Jul 31, 2020
867b1de
Add editorconfig caching
tarik-brown Aug 7, 2020
a7ff8ce
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Aug 12, 2020
44eeef1
Work in progress
Colengms Aug 12, 2020
050d7cb
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Aug 14, 2020
e942840
Fix some setting names
Colengms Aug 15, 2020
a947aaa
Remove activation events
Colengms Aug 15, 2020
88dfa48
Avoid on-type formatting for close curly and newline, if not using vc…
Colengms Aug 15, 2020
5343595
Only apply formatting on-type with clang-format if character was semi…
Colengms Aug 17, 2020
374ea16
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Aug 17, 2020
f74f191
Update comment
Colengms Aug 17, 2020
d6d2d63
Merge branch 'master' into dev/t-tabro/editorconfig
Colengms Aug 17, 2020
7c5bc40
Add some missing plumbing
Colengms Aug 17, 2020
7b68876
Merge branch 'dev/t-tabro/editorconfig' of https://github.com/microso…
Colengms Aug 17, 2020
7c8e92c
Improve some setting descriptions
Colengms Aug 17, 2020
8339a6d
Fix issue with bad format ranges returned to VS Code
Colengms Aug 17, 2020
ce59f40
Restore some code that was probably removed by a bad merge
Colengms Aug 17, 2020
767970d
Fix wrong setting name in initial options
Colengms Aug 18, 2020
dad678f
Merge branch 'master' of https://github.com/microsoft/vscode-cpptools…
Colengms Aug 18, 2020
b2f1e28
Deregister formatting providers when formatting is disabled
Colengms Aug 19, 2020
ee0c869
Remove open-brace on-type formatting
Colengms Aug 19, 2020
93e4df2
Merge branch 'master' into dev/t-tabro/editorconfig
Colengms Aug 19, 2020
7c7a4cf
Merge branch 'master' into dev/t-tabro/editorconfig
Colengms Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,24 @@
"description": "%c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description%",
"scope": "resource"
},
"C_Cpp.vcFormat.indent.preserveIndentationWithinParentheses": {
"C_Cpp.vcFormat.indent.withinParentheses": {
"type": "string",
"enum": [
"alignToParenthesis",
"indent"
],
"enumDescriptions": [
"%c_cpp.configuration.vcFormat.indent.withinParentheses.alignToParenthesis.description%",
"%c_cpp.configuration.vcFormat.indent.withinParentheses.indent.description%"
],
"default": "indent",
"description": "%c_cpp.configuration.vcFormat.indent.withinParentheses.description%",
"scope": "resource"
},
"C_Cpp.vcFormat.indent.preserveWithinParentheses": {
"type": "boolean",
"default": false,
"description": "%c_cpp.configuration.vcFormat.indent.preserveIndentationWithinParentheses.description%",
"description": "%c_cpp.configuration.vcFormat.indent.preserveWithinParentheses.description%",
"scope": "resource"
},
"C_Cpp.vcFormat.indent.caseLabels": {
Expand Down Expand Up @@ -300,13 +314,13 @@
},
"C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyType": {
"type": "boolean",
"default": true,
"default": false,
"description": "%c_cpp.configuration.vcFormat.newLine.closeBraceSameLine.emptyType.description%",
"scope": "resource"
},
"C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction": {
"type": "boolean",
"default": true,
"default": false,
"description": "%c_cpp.configuration.vcFormat.newLine.closeBraceSameLine.emptyFunction.description%",
"scope": "resource"
},
Expand Down Expand Up @@ -2219,6 +2233,7 @@
"@typescript-eslint/parser": "^2.19.2",
"async-child-process": "^1.1.1",
"await-notify": "^1.0.1",
"editorconfig": "^0.15.3",
"escape-string-regexp": "^2.0.0",
"eslint": "^6.8.0",
"eslint-plugin-import": "^2.20.1",
Expand Down
7 changes: 5 additions & 2 deletions Extension/package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
"c_cpp.configuration.formatting.Default.description": "clang-format will be used to format code",
"c_cpp.configuration.formatting.Disabled.description": "Code formatting will be disabled",
"c_cpp.configuration.vcFormat.indent.braces.description": "Braces are indented by the amount specified in the Editor: Tab Size setting",
"c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "When a new line is typed, indent the new line relatively to:",
"c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.description": "Indent new lines relatively to:",
"c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.outermostParenthesis.description": "the outermost open parenthesis",
"c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.innermostParenthesis.description": "the innermost open parenthesis",
"c_cpp.configuration.vcFormat.indent.multiLineRelativeTo.statementBegin.description": "the beginning of the current statement",
"c_cpp.configuration.vcFormat.indent.preserveIndentationWithinParentheses.description": "When a new line is typed, it is aligned under the opening parenthesis or it is indented by the amount specified in the Editor: Tab Size setting",
"c_cpp.configuration.vcFormat.indent.withinParentheses.description": "When a new line is typed, it is aligned under the opening parenthesis or based on `C_Cpp.vcFormat.indent.multiLineRelativeTo`",
"c_cpp.configuration.vcFormat.indent.withinParentheses.alignToParenthesis.description": "New line is aligned under the opening parenthesis",
"c_cpp.configuration.vcFormat.indent.withinParentheses.indent.description": "New line is indented based on `C_Cpp.vcFormat.indent.multiLineRelativeTo`",
"c_cpp.configuration.vcFormat.indent.preserveWithinParentheses.description": "In existing code, preserve the existing indent alignment of new lines within parentheses",
"c_cpp.configuration.vcFormat.indent.caseLabels.description": "Labels are indented relative to switch statements by the amount specified in the Editor: Tab Size setting",
"c_cpp.configuration.vcFormat.indent.caseContents.description": "Code inside case is indented relative to its label by the amount specified in the Editor: Tab Size setting",
"c_cpp.configuration.vcFormat.indent.caseContentsWhenBlock.description": "Indent braces following a case statement by the amount specified in the Editor: Tab Size setting",
Expand Down
Loading