Skip to content

Commit

Permalink
Merge pull request #840 from ethereum/fe-v2
Browse files Browse the repository at this point in the history
Fe v2
  • Loading branch information
sbillig authored Jan 18, 2025
2 parents c2dc82d + 7c2be9f commit 91ff3da
Show file tree
Hide file tree
Showing 693 changed files with 65,566 additions and 976 deletions.
31 changes: 31 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "fe-lang-v2",
"image": "mcr.microsoft.com/devcontainers/rust:latest",
"features": {
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
},
"extensions": [
"GitHub.vscode-github-actions",
"ms-vsliveshare.vsliveshare",
"vadimcn.vscode-lldb",
"matklad.rust-analyzer",
"serayuzgur.crates",
"tamasfe.even-better-toml",
"usernamehw.errorlens",
"aaron-bond.better-comments",
"yzhang.markdown-all-in-one"
],
"settings": {
"explorer.compactFolders": false,
"editor.rulers": [
80
],
"workbench.colorTheme": "Default Dark+",
"workbench.preferredDarkColorTheme": "Monokai",
"workbench.colorCustomizations": {
"editorRuler.foreground": "#5f5f62"
},
"workbench.activityBar.location": "top"
}
}
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ on:
env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-D warnings"
RUST_BACKTRACE: full

jobs:
lint:
runs-on: ubuntu-latest
env:
RUSTFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v3
- name: Install system dependencies
Expand Down Expand Up @@ -102,7 +104,7 @@ jobs:
# wasm-pack needs a Cargo.toml with a 'package' field.
# (see https://github.com/rustwasm/wasm-pack/issues/642)
# This will still run all tests in the workspace.
run: wasm-pack test --node crates/fe --workspace
run: wasm-pack test --node crates/fe --workspace --exclude fe-language-server

release:
# Only run this when we push a tag
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
tarpaulin-report.html
/output
/docs/tmp_snippets
.vscode
.vscode
.DS_Store
23 changes: 23 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "0.2.0",
"configurations": [
{
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/crates/language-server/editors/vscode",
"${workspaceFolder}/crates/",
"--disable-extensions"
],
"name": "Launch Fe VSCode Extension",
"outFiles": [
"${workspaceFolder}/crates/language-server/editors/vscode/out/**/*.js"
],
"preLaunchTask": "compile-vscode-extension",
"request": "launch",
"type": "extensionHost",
"env": {
"RUST_BACKTRACE": "full",
"NODE_ENV": "development"
}
}
]
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.tabSize": 4,
"rust-analyzer.linkedProjects": [
"./crates/language-server/Cargo.toml"
],
}
14 changes: 14 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "compile-vscode-extension",
"type": "shell",
"command": "npm install && npm run compile",
"options": {
"cwd": "${workspaceFolder}/crates/language-server/editors/vscode"
},
"problemMatcher": []
}
]
}
Loading

0 comments on commit 91ff3da

Please sign in to comment.