Skip to content

Commit

Permalink
Replace extensions with up-to-date equivalents (#8784)
Browse files Browse the repository at this point in the history
* Replace extensions with up-to-date equivalents

* Generate missing `.rbi` files

* Add more default settings
  • Loading branch information
JamieMagee committed Jan 16, 2024
1 parent 0c70225 commit eb61003
Show file tree
Hide file tree
Showing 14 changed files with 160 additions and 54 deletions.
59 changes: 23 additions & 36 deletions .devcontainer/core-dev/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,42 +78,29 @@

"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
],

// Use 'settings' to set *default* container specific settings.json values on container create.
// You can edit these settings after create using File > Preferences > Settings > Remote.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"solargraph.useBundler": true,
"ruby.useBundler": true,
"ruby.useLanguageServer": true,
"ruby.lint": {
"rubocop": {
"useBundler": true,
"lint": true
},
"reek": {
"useBundler": true
"customizations": {
"vscode": {
"extensions": [
"ms-vscode-remote.remote-containers",
"rubocop.vscode-rubocop",
"shopify.ruby-extensions-pack"
],
"settings": {
"[ruby]": {
"editor.defaultFormatter": "Shopify.ruby-lsp",
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.insertSpaces": true,
"editor.rulers": [120],
"editor.semanticHighlighting.enabled": true,
"editor.tabSize": 2,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true
},
"rubocop.autocorrect": true,
"sorbet.enabled": true
}
},
"ruby.format": "rubocop",
"[ruby]": {
"editor.defaultFormatter": "misogi.ruby-rubocop"
}
},

// Uncomment the next line if you want to publish any ports.
// "appPort": [],

// Uncomment the next line to run commands after the container is created.
// "postCreateCommand": "ruby --version"

"extensions": [
"rebornix.ruby",
"castwide.solargraph",
"LoranKloeze.ruby-rubocop-revived",
"groksrc.ruby",
"hoovercj.ruby-linter",
"miguel-savignano.ruby-symbols",
"koichisasada.vscode-rdbg"
]
}
}
25 changes: 25 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,30 @@
"ghcr.io/devcontainers/features/sshd:1": {
"version": "latest"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode-remote.remote-containers",
"rubocop.vscode-rubocop",
"shopify.ruby-extensions-pack"
],
"settings": {
"[ruby]": {
"editor.defaultFormatter": "Shopify.ruby-lsp",
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.insertSpaces": true,
"editor.rulers": [120],
"editor.semanticHighlighting.enabled": true,
"editor.tabSize": 2,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true
},
"rubocop.autocorrect": true,
"sorbet.enabled": true
}
}
}
}
21 changes: 5 additions & 16 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"rebornix.ruby",
"castwide.solargraph",
"LoranKloeze.ruby-rubocop-revived",
"groksrc.ruby",
"hoovercj.ruby-linter",
"miguel-savignano.ruby-symbols",
"ms-vscode-remote.remote-containers",
"koichisasada.vscode-rdbg",
"sorbet.sorbet-vscode-extension"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
"recommendations": [
"ms-vscode-remote.remote-containers",
"rubocop.vscode-rubocop",
"shopify.ruby-extensions-pack"
]
}
17 changes: 15 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@
},
"jest.pathToJest": "${workspaceFolder}/npm_and_yarn/helpers/node_modules/.bin/jest",
"jest.pathToConfig": "${workspaceFolder}/npm_and_yarn/helpers/jest.config.js",
"sorbet.enabled": true,
"dotnet.defaultSolution": "nuget/helpers/lib/NuGetUpdater/NuGetUpdater.sln"
"dotnet.defaultSolution": "nuget/helpers/lib/NuGetUpdater/NuGetUpdater.sln",
"[ruby]": {
"editor.defaultFormatter": "Shopify.ruby-lsp",
"editor.formatOnSave": true,
"editor.formatOnType": true,
"editor.insertSpaces": true,
"editor.rulers": [120],
"editor.semanticHighlighting.enabled": true,
"editor.tabSize": 2,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true
},
"rubocop.autocorrect": true,
"sorbet.enabled": true
}
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ common_gemspec = File.expand_path("common/dependabot-common.gemspec", __dir__)
deps_shared_with_common = %w(
gpgme
rake
rubocop
rubocop-performance
rubocop-sorbet
stackprof
webmock
webrick
Expand Down
25 changes: 25 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ GEM
multi_xml (>= 0.5.2)
jmespath (1.6.2)
json (2.6.3)
language_server-protocol (3.17.0.3)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1205)
Expand Down Expand Up @@ -216,16 +217,37 @@ GEM
stringio
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rake (13.1.0)
rbi (0.1.6)
prism (>= 0.18.0, < 0.20)
sorbet-runtime (>= 0.5.9204)
regexp_parser (2.8.3)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.6)
rubocop (1.58.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-sorbet (0.7.6)
rubocop (>= 0.90.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sawyer (0.9.2)
Expand Down Expand Up @@ -300,6 +322,9 @@ DEPENDENCIES
dependabot-terraform!
gpgme (~> 2.0)
rake (~> 13)
rubocop (~> 1.58.0)
rubocop-performance (~> 1.19.0)
rubocop-sorbet (~> 0.7.3)
sorbet (= 0.5.11178)
stackprof (~> 0.2.16)
tapioca (= 0.11.14)
Expand Down
8 changes: 8 additions & 0 deletions sorbet/rbi/gems/language_server-protocol@3.17.0.3.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/rainbow@3.1.1.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/regexp_parser@2.8.3.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/rubocop-ast@1.30.0.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/rubocop-performance@1.19.1.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/rubocop-sorbet@0.7.6.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/rubocop@1.58.0.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sorbet/rbi/gems/ruby-progressbar@1.13.0.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit eb61003

Please sign in to comment.