Skip to content

Commit 980f371

Browse files
committed
trying to implement lsp
[ci skip]
1 parent c072cbc commit 980f371

11 files changed

Lines changed: 371 additions & 197 deletions

File tree

examples/sushi/audits/assert_item_price_above_zero.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ AUDIT (
66

77
SELECT *
88
FROM sushi.items
9-
WHERE price <= 0
9+
WHERE price <= 0

examples/sushi/models/top_waiters.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ MODEL (
1010

1111
WITH test_macros AS (
1212
SELECT
13-
@ADD_ONE(1) AS lit_two,
13+
@ADD_ONE(1) AS lit_two,
1414
@MULTIPLY(revenue, 2.0) AS sql_exp,
1515
@SQL_LITERAL(revenue::TEXT, 'x', 'y', a, "b") AS sql_lit
1616
FROM sushi.waiter_revenue_by_day
1717
)
1818
SELECT
19-
waiter_id::INT AS waiter_id,
19+
waiter_id::INT AS waiter_id ,
2020
revenue::DOUBLE AS revenue
2121
FROM sushi.waiter_revenue_by_day
2222
WHERE
2323
event_date = (
24-
SELECT
24+
SELECT
2525
MAX(event_date)
2626
FROM sushi.waiter_revenue_by_day
2727
)

examples/sushi/models/waiter_as_customer_by_day.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ JINJA_QUERY_BEGIN;
2323

2424
SELECT
2525
w.waiter_id as waiter_id,
26-
wn.name as waiter_name,
26+
wn.name as waiter_name ,
2727
{{ alias(identity(x), 'flag') }},
2828
w.event_date as event_date
2929
FROM sushi.waiters AS w

package-lock.json

Lines changed: 51 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,16 @@ web = [
121121
"lsprotocol",
122122
"pygls",
123123
]
124+
lsp = [
125+
"pygls",
126+
"lsprotocol"
127+
]
124128
risingwave = ["psycopg2"]
125129

126130
[project.scripts]
127131
sqlmesh = "sqlmesh.cli.main:cli"
128132
sqlmesh_cicd = "sqlmesh.cicd.bot:bot"
133+
sqlmesh_lsp = "sqlmesh.lsp.main:main"
129134

130135
[project.entry-points."airflow.plugins"]
131136
sqlmesh_airflow = "sqlmesh.schedulers.airflow.plugin:SqlmeshAirflowPlugin"
@@ -149,7 +154,7 @@ fallback_version = "0.0.0"
149154
local_scheme = "no-local-version"
150155

151156
[tool.setuptools.packages.find]
152-
include = ["sqlmesh", "sqlmesh.*", "web*"]
157+
include = ["sqlmesh", "sqlmesh.*", "web*"]
153158

154159
[tool.setuptools.package-data]
155160
web = ["client/dist/**"]

sqlmesh/cli/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def ui(ctx: click.Context, host: str, port: int, mode: str) -> None:
778778
@cli_analytics
779779
def lsp(obj: Context) -> None:
780780
"""Start a language server for SQLMesh."""
781-
from web.lsp.main import server
781+
from lsp.main import server
782782

783783
server.start_io()
784784

web/lsp/main.py renamed to sqlmesh/lsp/main.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,3 +215,8 @@ async def did_change_watched_files(ls: LanguageServer, params: types.DidChangeWa
215215
)
216216
updated[context.path] = True
217217

218+
def main():
219+
server.start_io()
220+
221+
if __name__ == "__main__":
222+
main()

vscode/extension/package.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,21 @@
99
"categories": [
1010
"Other"
1111
],
12-
"activationEvents": [],
12+
"activationEvents": [
13+
"onLanguage:sql"
14+
],
1315
"main": "./dist/extension.js",
1416
"contributes": {
1517
"viewsContainers": {
16-
"panel": [
17-
{
18-
"id": "lineage_view",
19-
"title": "Lineage",
20-
"icon": "./assets/images/dag.svg"
21-
}
22-
]
18+
"panel": [
19+
{
20+
"id": "lineage_view",
21+
"title": "Lineage",
22+
"icon": "./assets/images/dag.svg"
23+
}
24+
]
2325
},
24-
"views": {
26+
"views": {
2527
"lineage_view": [
2628
{
2729
"id": "sqlmesh.lineage",

0 commit comments

Comments
 (0)