Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix setting words #20

Merged
merged 1 commit into from
Oct 4, 2023
Merged

fix setting words #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions client/src/browserClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,16 @@ export async function activate(context: vscode.ExtensionContext) {
e.uri.toString(),
JSON.stringify(filesToCompile[i].entrypoints)
);
const contents: Uint8Array = new Uint8Array(Buffer.from(
format(
result
? JSON.stringify(result, null, 2)
: "failed to compile!",
{ parser: "json", plugins: [ babelParser ] }
)
));
const contents = Uint8Array.from(
Array.from(
result
? format(
JSON.stringify(result, null, 2),
{ parser: "json", plugins: [ babelParser ] }
)
: "\"failed to compile!\""
).map(v => v.charCodeAt(0))
);
workspaceEdit.createFile(
filesToCompile[i].json,
{ overwrite: true, contents }
Expand Down
16 changes: 9 additions & 7 deletions client/src/nodeClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,15 @@ export async function activate(context: vscode.ExtensionContext) {
e.uri.toString(),
filesToCompile[i].entrypoints
);
const contents: Uint8Array = Buffer.from(
format(
result
? JSON.stringify(result, null, 2)
: "failed to compile!",
{ parser: "json" }
)
const contents = Uint8Array.from(
Array.from(
result
? format(
JSON.stringify(result, null, 2),
{ parser: "json" }
)
: "\"failed to compile!\""
).map(v => v.charCodeAt(0))
);
workspaceEdit.createFile(
filesToCompile[i].json,
Expand Down
1 change: 1 addition & 0 deletions rain-language-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
["[", "]"],
["/**", "*/"]
],
"wordPattern": "[a-zA-Z0-9-_]+",
"onEnterRules": [
{
// e.g. /** | */
Expand Down
12 changes: 6 additions & 6 deletions server/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.

2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"url": "https://github.com/rainprotocol/rainlang-vscode/issues"
},
"dependencies": {
"@rainprotocol/rainlang": "github:rainprotocol/rainlang#9a020abd3db12e4da6618768ffca70099cc9548d",
"@rainprotocol/rainlang": "github:rainprotocol/rainlang#08876839b07baa3ddf36343fe50066fe8c18631d",
"vscode-languageserver": "^8.1.0"
}
}
4 changes: 2 additions & 2 deletions server/src/browserServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ connection.onInitialize(async(params: InitializeParams) => {
if (params.initializationOptions) {
const settings = JSON.parse(params.initializationOptions);
if (settings.localMetas) for (const hash of Object.keys(settings.localMetas)) {
metaStore.updateStore(hash, settings.localMetas[hash]);
await metaStore.updateStore(hash, settings.localMetas[hash]);
}
if (settings.subgraphs) metaStore.addSubgraphs(settings.subgraphs);
if (settings.subgraphs) await metaStore.addSubgraphs(settings.subgraphs);
}

langServices = getRainLanguageServices({
Expand Down
4 changes: 2 additions & 2 deletions server/src/nodeServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ connection.onInitialize(async(params) => {
if (params.initializationOptions) {
if (params.initializationOptions.localMetas) {
for (const hash of Object.keys(params.initializationOptions.localMetas)) {
metaStore.updateStore(hash, params.initializationOptions.localMetas[hash]);
await metaStore.updateStore(hash, params.initializationOptions.localMetas[hash]);
}
}
if (params.initializationOptions.subgraphs) metaStore.addSubgraphs(
if (params.initializationOptions.subgraphs) await metaStore.addSubgraphs(
params.initializationOptions.subgraphs
);
}
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/rainlang-syntax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"name": "keyword.reserved.rainlang"
},
"import": {
"match": "(@)\\s*([a-zA-Z0-9-_.]*\\s+)?(0x[a-fA-F0-9]+)\\b",
"match": "(@)\\s*([a-zA-Z][a-zA-Z0-9-_]*\\s+)?(0(x[a-fA-F0-9]*)?\\b)?",
"captures": {
"1": {
"name": "storage.import.rainlang"
Expand Down