Skip to content
This repository was archived by the owner on Aug 31, 2023. It is now read-only.

feat(vscode): enable JSON formatting #4146

Merged
ematipico merged 10 commits into from
Jan 10, 2023
Merged

feat(vscode): enable JSON formatting #4146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d51d3bf
Update language support table
Jan 3, 2023
146a38f
Format generated files
Jan 3, 2023
80c0168
Update website/src/pages/internals/language_support.mdx
MichaReiser Jan 3, 2023
46bd3b0
Resolve merge issues, fix clippy
MichaReiser Jan 4, 2023
940c1b4
Clarify language support table
MichaReiser Jan 4, 2023
d4b51c6
Tests
MichaReiser Jan 4, 2023
b0de12d
chore: rebase
ematipico Jan 10, 2023
5d9a9ee
feat(vscode): enable JSON formatting
ematipico Jan 10, 2023
19a55aa
chore: add `jsconfig.json`
ematipico Jan 10, 2023
328115f
chore: change engine to npm 9
ematipico Jan 10, 2023
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
Prev Previous commit
Next Next commit
feat(vscode): enable JSON formatting
  • Loading branch information
@ematipico
ematipico committed Jan 10, 2023
commit 5d9a9ee0c2e285cf62a9409a8ec1e3fdaa2514ba
2 changes: 1 addition & 1 deletion editors/vscode/package-lock.json
View file
Open in desktop

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

8 changes: 5 additions & 3 deletions editors/vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@
"onLanguage:javascriptreact",
"onLanguage:typescript",
"onLanguage:typescriptreact",
"onLanguage:json",
"onCommand:rome.syntaxTree"
],
"main": "./out/main.js",
"repository": {
"type": "git",
"url": "https://github.com/rome/tools.git"
"url": "https://github.com/rome/tools.git",
"directory": "editors/vscode"
},
"bugs": {
"url": "https://github.com/rome/tools/issues"
},
"engines": {
"vscode": "^1.70.0",
"npm": "^8"
"npm": "^8 || ^9"
},
"capabilities": {
"untrustedWorkspaces": {
Expand Down Expand Up @@ -150,4 +152,4 @@
"resolve": "^1.22.1",
"vscode-languageclient": "^8.0.2"
}
}
}
16 changes: 15 additions & 1 deletion npm/js-api/tests/formatContent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("Rome WebAssembly formatContent", () => {
rome.shutdown();
});

it("should format content", () => {
it("should format JavaScript content", () => {
const result = rome.formatContent("function f () { }", {
filePath: "example.js",
});
Expand All @@ -22,6 +22,20 @@ describe("Rome WebAssembly formatContent", () => {
expect(result.diagnostics).toEqual([]);
});

it("should format JSON content", () => {
const result = rome.formatContent(
'{ "lorem": "ipsum", "foo": false, "bar": 23, "lorem": "ipsum", "foo": false, "bar": 23 }',
{
filePath: "example.json",
},
);

expect(result.content).toEqual(
'{\n\t"lorem": "ipsum",\n\t"foo": false,\n\t"bar": 23,\n\t"lorem": "ipsum",\n\t"foo": false,\n\t"bar": 23\n}\n',
);
expect(result.diagnostics).toEqual([]);
});

it("should not format and have diagnostics", () => {
const content = "function () { }";
const result = rome.formatContent(content, {
Expand Down
3 changes: 2 additions & 1 deletion npm/js-api/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
"strict": true, /* Enable all strict type-checking options. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
"skipLibCheck": true, /* Skip type checking all .d.ts files. */
"lib": ["ES2021"]
},
"exclude": [
"./tests",
Expand Down