chore: merge develop to apex-oas #5984
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update README.md * Update README.md * Update developing.md
…orcedx-utils-vscode (#5949) * chore(deps): bump cross-spawn in /packages/salesforcedx-utils-vscode Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.5. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.5) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * chore: bump cross-spawn to v7.0.6 and @types/cross-spawn to v6.0.6 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daphne Yang <139700604+daphne-sfdc@users.noreply.github.com> Co-authored-by: Daphne Yang <daphne.yang@salesforce.com>
* feat: add missing labels for org browser * chore: labels missing in japanese file
* feat: add an user setting to disable error to telemetry by default * chore: fix linting * chore: updated jar
# Conflicts: # lerna.json # package-lock.json # packages/salesforcedx-apex-debugger/package.json # packages/salesforcedx-apex-replay-debugger/package.json # packages/salesforcedx-sobjects-faux-generator/package.json # packages/salesforcedx-test-utils-vscode/package.json # packages/salesforcedx-utils-vscode/package.json # packages/salesforcedx-utils/package.json # packages/salesforcedx-visualforce-language-server/package.json # packages/salesforcedx-visualforce-markup-language-server/package.json # packages/salesforcedx-vscode-apex-debugger/package.json # packages/salesforcedx-vscode-apex-replay-debugger/package.json # packages/salesforcedx-vscode-apex/out/apex-jorje-lsp.jar # packages/salesforcedx-vscode-apex/package.json # packages/salesforcedx-vscode-apex/package.nls.ja.json # packages/salesforcedx-vscode-apex/package.nls.json # packages/salesforcedx-vscode-apex/src/languageServer.ts # packages/salesforcedx-vscode-apex/src/settings.ts # packages/salesforcedx-vscode-core/package.json # packages/salesforcedx-vscode-expanded/package.json # packages/salesforcedx-vscode-lightning/package.json # packages/salesforcedx-vscode-lwc/package.json # packages/salesforcedx-vscode-soql/package.json # packages/salesforcedx-vscode-visualforce/package.json # packages/salesforcedx-vscode/package.json # packages/system-tests/package.json
mingxuanzhangsfdx
approved these changes
Dec 17, 2024
daphne-sfdc
requested changes
Dec 17, 2024
Comment on lines
468
to
517
| } | ||
| }, | ||
| "languages": [ | ||
| { | ||
| "id": "apex", | ||
| "aliases": [ | ||
| "Apex", | ||
| "apex" | ||
| ], | ||
| "extensions": [ | ||
| ".cls", | ||
| ".trigger", | ||
| ".soql" | ||
| ], | ||
| "configuration": "./syntaxes/apex.configuration.json" | ||
| }, | ||
| { | ||
| "id": "apex-anon", | ||
| "aliases": [ | ||
| "Anonymous Apex" | ||
| ], | ||
| "extensions": [ | ||
| ".apex" | ||
| ], | ||
| "configuration": "./syntaxes/apex.configuration.json" | ||
| } | ||
| ], | ||
| "grammars": [ | ||
| { | ||
| "language": "apex", | ||
| "scopeName": "source.apex", | ||
| "path": "./grammars/apex.tmLanguage" | ||
| }, | ||
| { | ||
| "language": "apex-anon", | ||
| "scopeName": "source.apex", | ||
| "path": "./grammars/apex.tmLanguage" | ||
| } | ||
| ], | ||
| "snippets": [ | ||
| { | ||
| "language": "apex", | ||
| "path": "./snippets/apex.json" | ||
| } | ||
| ] | ||
| "languages": [ | ||
| { | ||
| "id": "apex", | ||
| "aliases": [ | ||
| "Apex", | ||
| "apex" | ||
| ], | ||
| "extensions": [ | ||
| ".cls", | ||
| ".trigger", | ||
| ".soql" | ||
| ], | ||
| "configuration": "./syntaxes/apex.configuration.json" | ||
| }, | ||
| { | ||
| "id": "apex-anon", | ||
| "aliases": [ | ||
| "Anonymous Apex" | ||
| ], | ||
| "extensions": [ | ||
| ".apex" | ||
| ], | ||
| "configuration": "./syntaxes/apex.configuration.json" | ||
| } | ||
| ], | ||
| "grammars": [ | ||
| { | ||
| "language": "apex", | ||
| "scopeName": "source.apex", | ||
| "path": "./grammars/apex.tmLanguage" | ||
| }, | ||
| { | ||
| "language": "apex-anon", | ||
| "scopeName": "source.apex", | ||
| "path": "./grammars/apex.tmLanguage" | ||
| } | ||
| ], | ||
| "snippets": [ | ||
| { | ||
| "language": "apex", | ||
| "path": "./snippets/apex.json" | ||
| } | ||
| ] | ||
| } |
There was a problem hiding this comment.
Is this change in indentation intentional? I see that the languages entry is moved one tab to the right in the new version. Mingxuan's PR also has the original indentation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge develop to aos
@W-0@