Skip to content

Fix ruby lsp #510

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.

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
8 changes: 2 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
3009
],
// "forwardPorts": [
// ],

// Uncomment the next line if you want start specific services in your Docker Compose config.
// "runServices": [],
Expand Down Expand Up @@ -73,9 +72,6 @@
"terminal.integrated.defaultProfile.linux": "zsh",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit"
},
"rubyLsp.enabledFeatures": {
"diagnostics": true
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ services:
- node_modules:/app/node_modules

volumes:
node_modules: null
node_modules:
postgres_data:
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ AWS_SECRET_ACCESS_KEY=changeme

GITHUB_WEBHOOK_SECRET=test_token
GITHUB_WEBHOOK_REF="refs/heads/draft"
# GITHUB_AUTH_TOKEN="" # Only needed if testing editor builds with Github Api

POSTGRES_HOST=db
POSTGRES_PASSWORD=password
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ FROM builder AS dev-container
RUN apt-get update \
&& apt-get install --yes --no-install-recommends sudo git vim zsh ssh curl less
RUN sh -c "$(curl -L https://github.com/deluan/zsh-in-docker/releases/download/v1.1.5/zsh-in-docker.sh)" -- \
-t robbyrussell \
-p git -p docker-compose -p yarn \
-p https://github.com/zsh-users/zsh-autosuggestions \
# -p https://github.com/marlonrichert/zsh-autocomplete \
-p https://github.com/unixorn/fzf-zsh-plugin
-t robbyrussell \
-p git -p docker-compose -p yarn \
-p https://github.com/zsh-users/zsh-autosuggestions \
-p https://github.com/marlonrichert/zsh-autocomplete \
-p https://github.com/unixorn/fzf-zsh-plugin
RUN chsh -s $(which zsh) ${USER}

# Slim application image without development dependencies
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ end
group :development do
gem 'awesome_print'
gem 'rails-erd'
gem 'ruby-lsp', '~> 0.17.7'
gem 'ruby-lsp'
gem 'ruby-lsp-rails'
gem 'ruby-lsp-rspec'
end
Expand Down
24 changes: 12 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
logger (1.6.0)
language_server-protocol (3.17.0.4)
logger (1.6.6)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand Down Expand Up @@ -304,7 +304,7 @@ GEM
postmark-rails (0.22.1)
actionmailer (>= 3.0.0)
postmark (>= 1.21.3, < 2.0)
prism (0.30.0)
prism (1.3.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
Expand Down Expand Up @@ -367,7 +367,7 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rbs (3.5.2)
rbs (3.8.1)
logger
rdoc (6.7.0)
psych (>= 4.0.0)
Expand Down Expand Up @@ -426,15 +426,15 @@ GEM
rubocop-capybara (~> 2.17)
ruby-graphviz (1.2.5)
rexml
ruby-lsp (0.17.7)
ruby-lsp (0.23.11)
language_server-protocol (~> 3.17.0)
prism (>= 0.29.0, < 0.31)
prism (>= 1.2, < 2.0)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
ruby-lsp-rails (0.3.10)
ruby-lsp (>= 0.17.2, < 0.18.0)
ruby-lsp-rspec (0.1.12)
ruby-lsp (~> 0.17.0)
ruby-lsp-rails (0.4.0)
ruby-lsp (>= 0.23.0, < 0.24.0)
ruby-lsp-rspec (0.1.22)
ruby-lsp (~> 0.23.0)
ruby-progressbar (1.11.0)
ruby-vips (2.2.0)
ffi (~> 1.12)
Expand Down Expand Up @@ -473,7 +473,7 @@ GEM
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
sorbet-runtime (0.5.11481)
sorbet-runtime (0.5.11856)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
Expand Down Expand Up @@ -565,7 +565,7 @@ DEPENDENCIES
rubocop-graphql
rubocop-rails
rubocop-rspec
ruby-lsp (~> 0.17.7)
ruby-lsp
ruby-lsp-rails
ruby-lsp-rspec
scout_apm
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ services:
image: deltaprojects/smee-client
platform: linux/amd64
command: -u $SMEE_TUNNEL -t http://api:3009/github_webhooks
environment:
- SMEE_TUNNEL

volumes:
postgres-data: