Skip to content

Commit c20a293

Browse files
authored
Merge pull request #144 from juleswritescode/fix/vscode-paths
2 parents d76481b + fedfd9a commit c20a293

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

editors/code/.prettierrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ module.exports = {
22
// use 100 because it's Rustfmt's default
33
// https://rust-lang.github.io/rustfmt/?version=v1.4.38&search=#max_width
44
printWidth: 100,
5+
singleQuote: true,
6+
tabWidth: 4,
7+
trailingComma: 'none'
58
};

editors/code/src/main.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
Executable,
55
LanguageClient,
66
LanguageClientOptions,
7-
ServerOptions,
7+
ServerOptions
88
} from 'vscode-languageclient/node';
99

1010
let client: LanguageClient;
@@ -13,7 +13,7 @@ export function activate(context: ExtensionContext) {
1313
// If the extension is launched in debug mode then the debug server options are used
1414
// Otherwise the run options are used
1515
const run: Executable = {
16-
command: 'postgres_lsp',
16+
command: 'pglsp'
1717
};
1818
const serverOptions: ServerOptions = {
1919
run,
@@ -23,7 +23,9 @@ export function activate(context: ExtensionContext) {
2323
// Options to control the language client
2424
const clientOptions: LanguageClientOptions = {
2525
// Register the server for plain text documents
26-
documentSelector: [{ scheme: 'file', language: 'sql' }]
26+
documentSelector: [
27+
{ scheme: 'file', language: 'sql' }
28+
]
2729
};
2830

2931
// Create the language client and start the client.

xtask/src/install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ fn install_client(sh: &Shell, client_opt: ClientOpt) -> anyhow::Result<()> {
139139
fn install_server(sh: &Shell) -> anyhow::Result<()> {
140140
let cmd = cmd!(
141141
sh,
142-
"cargo install --path crates/postgres_lsp --locked --force"
142+
"cargo install --path crates/pg_lsp --locked --force"
143143
);
144144
cmd.run()?;
145145
Ok(())

0 commit comments

Comments
 (0)