Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Thumbs.db
.settings/
.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.shared.json
!.vscode/settings.shared.json
!.vscode/tasks.shared.json
*.launch
*.sublime-workspace
/.idea
Expand Down
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
// Integrates the dprint code formatter into the editor
"dprint.dprint",

// Enables us to have a shared Visual Studio configuration, while allowing each user to locally add or overwrite settings
"Swellaby.workspace-config-plus",

// Adds useful features for editing Markdown tables
"TakumiI.markdowntable",

Expand Down
30 changes: 1 addition & 29 deletions .vscode/settings.json → .vscode/settings.shared.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,11 @@
"**/obj": true,
},

// Configures the nesting of files that belong together in the explorer (the nested files are not expanded by default); this configuration nests
// all Node.js-related configuration files under the "package.json" file, and all linter and code formatter configuration files under the
// ".editorconfig" file
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
".editorconfig": ".gitattributes, .gitignore, dprint.json",
"README.md": "CHANGELOG.md, CONTRIBUTORS.md, LICENSE, TODO.md",
},

// Specifies which Git branches are protected in this repository, Visual Studio will prevent users from committing to these branches (this only
// works for the commit feature that is built into Visual Studio Code and not in the terminal)
"git.branchProtection": [
"main",
"staging",
"development",
],

// Specifies that Visual Studio Code should always open the merge editor when a file is opened that has conflicts, instead of the code editor
Expand Down Expand Up @@ -91,22 +81,4 @@
"https://schemastore.azurewebsites.net/": true,
"https://www.schemastore.org/": true,
},

// Configures the icon theme to be VSCode Icons and adapts the icons of certain files and directories for the VSCode Icons plugin
"workbench.iconTheme": "vscode-icons",
"vsicons.associations.files": [
{ "icon": "dal", "extensions": ["CHANGELOG.md"], "filename": true, "format": "svg" },
{ "icon": "docz", "extensions": ["README.md"], "filename": true, "format": "svg" },
{ "icon": "janet", "extensions": ["CONTRIBUTORS.md"], "filename": true, "format": "svg" },
{ "icon": "todo", "extensions": ["TODO.md"], "filename": true, "format": "svg" },
{ "icon": "vscode", "extensions": [".vscode/extensions.json", ".vscode/settings.json"], "filename": true, "format": "svg" },
],
"vsicons.associations.folders": [
{ "icon": "app", "extensions": ["sample-app"], "format": "svg" },
{ "icon": "cli", "extensions": ["clinet-core"], "format": "svg" },
{ "icon": "coverage", "extensions": ["linters"], "format": "svg" },
{ "icon": "github", "extensions": ["workflows"], "format": "svg" },
{ "icon": "template", "extensions": ["design"], "format": "svg" },
{ "icon": "test", "extensions": ["unit-tests"], "format": "svg" },
],
}
8 changes: 6 additions & 2 deletions dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@
"jsonTrailingCommaFiles": [
".cspell.json",
".vscode/extensions.json",
".vscode/settings.json",
".vscode/tasks.json",
".vscode/launch.local.json",
".vscode/launch.shared.json",
".vscode/settings.local.json",
".vscode/settings.shared.json",
".vscode/tasks.local.json",
".vscode/tasks.shared.json",
"dprint.json",
],
},
Expand Down
1 change: 1 addition & 0 deletions tests/linters/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"markdowntable",
"Neumann",
"slnx",
"Swellaby",
"Takumi",
"unreviewed",
"vsicons",
Expand Down