Skip to content

Commit

Permalink
Merge branch 'main' into multi-line-completion-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
SPGoding committed May 26, 2024
2 parents 7d0ae87 + aef1665 commit 902518c
Show file tree
Hide file tree
Showing 100 changed files with 8,025 additions and 1,948 deletions.
4 changes: 1 addition & 3 deletions .dprint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@
],
"excludes": [
"**/node_modules",
// cannot format due to bug of dprint
"packages/java-edition/src/mcfunction/tree/patch.ts"
],
"plugins": [
"https://plugins.dprint.dev/typescript-0.85.0.wasm"
"https://plugins.dprint.dev/typescript-0.90.5.wasm"
]
}
4 changes: 3 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ module.exports = {
"project": "./packages/**/tsconfig.json"
},
"plugins": [
"@typescript-eslint"
"@typescript-eslint",
"import"
],
"ignorePatterns": [
"**/*.js",
Expand All @@ -38,6 +39,7 @@ module.exports = {
"@typescript-eslint/prefer-for-of": "warn",
"@typescript-eslint/prefer-readonly": "warn",
"@typescript-eslint/no-floating-promises": "error",
"import/no-duplicates": "error",
"indent": "off",
"no-fallthrough": "warn",
"no-restricted-syntax": [
Expand Down
28 changes: 14 additions & 14 deletions .packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"released": {
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.6"
"version": "0.3.8"
}
},
"java-edition": {
Expand All @@ -31,7 +31,7 @@
],
"released": {
"commit": "25de684da837dd553684e912490f92cf8c9c4e1f",
"version": "0.3.6"
"version": "0.3.8"
}
},
"json": {
Expand All @@ -40,8 +40,8 @@
"locales"
],
"released": {
"commit": "ad778e38026c1cadc82aac43329a19b69eb71686",
"version": "0.3.6"
"commit": "d9848358bb3a1e41b40e28e61b9c5771946e724b",
"version": "0.3.7"
}
},
"language-server": {
Expand All @@ -53,7 +53,7 @@
],
"released": {
"commit": "449e7c655e263425192fe41948904017543ad0cb",
"version": "0.4.5"
"version": "0.4.7"
}
},
"locales": {
Expand All @@ -68,8 +68,8 @@
"locales"
],
"released": {
"commit": "25de684da837dd553684e912490f92cf8c9c4e1f",
"version": "0.3.6"
"commit": "42dbc014068b184829a7e091bf7313c11b457ddd",
"version": "0.3.8"
}
},
"mcdoc-cli": {
Expand All @@ -78,8 +78,8 @@
"mcdoc"
],
"released": {
"commit": "15961aa1c7ce7d4ea72f2a6fccf478c044d90281",
"version": "0.1.5"
"commit": "834d1686f943372aa8f30b0adc21619a8f4da18e",
"version": "0.1.8"
}
},
"mcfunction": {
Expand All @@ -100,7 +100,7 @@
],
"released": {
"commit": "b626aff40da287707d03c8d451989fb91ac5f9c3",
"version": "0.3.6"
"version": "0.3.8"
}
},
"playground": {
Expand All @@ -111,17 +111,17 @@
"mcdoc"
],
"released": {
"commit": "f0d861382044f94ea005b1cfd11fc7e2d57d5663",
"version": "0.2.6"
"commit": "5c9576525a7a8bee2ce900295e2e52fec9316a41",
"version": "0.2.8"
}
},
"vscode-extension": {
"devDependencies": [
"language-server"
],
"released": {
"commit": "449e7c655e263425192fe41948904017543ad0cb",
"version": "0.3.6"
"commit": "5c9576525a7a8bee2ce900295e2e52fec9316a41",
"version": "0.3.8"
}
}
}
1 change: 1 addition & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"request": "launch",
"name": "Run Unit Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": ["--timeout", "999999"],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}
Expand Down
8 changes: 4 additions & 4 deletions __snapshots__/packages/core/test-out/parser/long.spec.js

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

200 changes: 200 additions & 0 deletions __snapshots__/packages/core/test-out/parser/util.spec.js

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

Loading

0 comments on commit 902518c

Please sign in to comment.