Compare commits
5 Commits
6505031da8
...
d6aea4b0f9
| Author | SHA1 | Date | |
|---|---|---|---|
| d6aea4b0f9 | |||
| 44b30d2339 | |||
| 3aa75843ac | |||
| 7645efc4f9 | |||
| 47c3fda4c8 |
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -34,4 +34,6 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
/tmp
|
/tmp
|
||||||
/docs
|
/docs
|
||||||
|
|
||||||
|
*.vsix
|
||||||
4
vscode-extension/.gitignore
vendored
4
vscode-extension/.gitignore
vendored
|
|
@ -1,4 +0,0 @@
|
||||||
node_modules
|
|
||||||
client/dist
|
|
||||||
server/dist
|
|
||||||
*.vsix
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
import { TextDocument, Position } from 'vscode-languageserver-textdocument'
|
import { TextDocument, Position } from 'vscode-languageserver-textdocument'
|
||||||
import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver/node'
|
import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver/node'
|
||||||
import { parser } from '../../../src/parser/shrimp'
|
import { Tree } from '@lezer/common'
|
||||||
import { Compiler } from '../../../src/compiler/compiler'
|
import { Compiler } from '../../../src/compiler/compiler'
|
||||||
import { CompilerError } from '../../../src/compiler/compilerError'
|
import { CompilerError } from '../../../src/compiler/compilerError'
|
||||||
|
|
||||||
export const buildDiagnostics = (textDocument: TextDocument): Diagnostic[] => {
|
export const buildDiagnostics = (textDocument: TextDocument, tree: Tree): Diagnostic[] => {
|
||||||
const text = textDocument.getText()
|
const text = textDocument.getText()
|
||||||
const diagnostics = getParseErrors(textDocument)
|
const diagnostics = getParseErrors(textDocument, tree)
|
||||||
|
|
||||||
if (diagnostics.length > 0) {
|
if (diagnostics.length > 0) {
|
||||||
return diagnostics
|
return diagnostics
|
||||||
|
|
@ -59,9 +59,7 @@ const unknownDiagnostic = (message: string): Diagnostic => {
|
||||||
return diagnostic
|
return diagnostic
|
||||||
}
|
}
|
||||||
|
|
||||||
const getParseErrors = (textDocument: TextDocument): Diagnostic[] => {
|
const getParseErrors = (textDocument: TextDocument, tree: Tree): Diagnostic[] => {
|
||||||
const tree = parser.parse(textDocument.getText())
|
|
||||||
|
|
||||||
const ranges: { start: Position; end: Position }[] = []
|
const ranges: { start: Position; end: Position }[] = []
|
||||||
tree.iterate({
|
tree.iterate({
|
||||||
enter(n) {
|
enter(n) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { parser } from '../../../src/parser/shrimp'
|
import { parser } from '../../../src/parser/shrimp'
|
||||||
import * as Terms from '../../../src/parser/shrimp.terms'
|
import * as Terms from '../../../src/parser/shrimp.terms'
|
||||||
import { SyntaxNode } from '@lezer/common'
|
import { SyntaxNode, Tree } from '@lezer/common'
|
||||||
import { TextDocument } from 'vscode-languageserver-textdocument'
|
import { TextDocument } from 'vscode-languageserver-textdocument'
|
||||||
import {
|
import {
|
||||||
SemanticTokensBuilder,
|
SemanticTokensBuilder,
|
||||||
|
|
@ -28,9 +28,7 @@ export const TOKEN_MODIFIERS = [
|
||||||
SemanticTokenModifiers.readonly,
|
SemanticTokenModifiers.readonly,
|
||||||
]
|
]
|
||||||
|
|
||||||
export function buildSemanticTokens(document: TextDocument): number[] {
|
export function buildSemanticTokens(document: TextDocument, tree: Tree): number[] {
|
||||||
const text = document.getText()
|
|
||||||
const tree = parser.parse(text)
|
|
||||||
const builder = new SemanticTokensBuilder()
|
const builder = new SemanticTokensBuilder()
|
||||||
const scopeTracker = new ScopeTracker(document)
|
const scopeTracker = new ScopeTracker(document)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { buildDiagnostics } from './diagnostics'
|
||||||
import { buildSemanticTokens, TOKEN_MODIFIERS, TOKEN_TYPES } from './semanticTokens'
|
import { buildSemanticTokens, TOKEN_MODIFIERS, TOKEN_TYPES } from './semanticTokens'
|
||||||
import { parser } from '../../../src/parser/shrimp'
|
import { parser } from '../../../src/parser/shrimp'
|
||||||
import { Compiler } from '../../../src/compiler/compiler'
|
import { Compiler } from '../../../src/compiler/compiler'
|
||||||
|
import { Tree } from '@lezer/common'
|
||||||
import {
|
import {
|
||||||
InitializeResult,
|
InitializeResult,
|
||||||
TextDocuments,
|
TextDocuments,
|
||||||
|
|
@ -10,18 +11,23 @@ import {
|
||||||
createConnection,
|
createConnection,
|
||||||
ProposedFeatures,
|
ProposedFeatures,
|
||||||
CompletionItemKind,
|
CompletionItemKind,
|
||||||
|
TextDocumentChangeEvent,
|
||||||
} from 'vscode-languageserver/node'
|
} from 'vscode-languageserver/node'
|
||||||
|
|
||||||
const connection = createConnection(ProposedFeatures.all)
|
const connection = createConnection(ProposedFeatures.all)
|
||||||
const documents = new TextDocuments(TextDocument)
|
const documents = new TextDocuments(TextDocument)
|
||||||
documents.listen(connection)
|
documents.listen(connection)
|
||||||
|
|
||||||
|
const documentTrees = new Map<string, Tree>()
|
||||||
|
|
||||||
// Server capabilities
|
// Server capabilities
|
||||||
connection.onInitialize(handleInitialize)
|
connection.onInitialize(handleInitialize)
|
||||||
|
|
||||||
// Language features
|
// Language features
|
||||||
connection.languages.semanticTokens.on(handleSemanticTokens)
|
connection.languages.semanticTokens.on(handleSemanticTokens)
|
||||||
|
documents.onDidOpen(handleDocumentOpen)
|
||||||
documents.onDidChangeContent(handleDocumentChange)
|
documents.onDidChangeContent(handleDocumentChange)
|
||||||
|
documents.onDidClose(handleDocumentClose)
|
||||||
connection.onCompletion(handleCompletion)
|
connection.onCompletion(handleCompletion)
|
||||||
|
|
||||||
// Debug commands
|
// Debug commands
|
||||||
|
|
@ -31,10 +37,7 @@ connection.onRequest('shrimp/bytecode', handleBytecode)
|
||||||
// Start listening
|
// Start listening
|
||||||
connection.listen()
|
connection.listen()
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// Handler implementations
|
// Handler implementations
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
function handleInitialize(): InitializeResult {
|
function handleInitialize(): InitializeResult {
|
||||||
connection.console.log('🦐 Server initialized with capabilities')
|
connection.console.log('🦐 Server initialized with capabilities')
|
||||||
const result: InitializeResult = {
|
const result: InitializeResult = {
|
||||||
|
|
@ -56,21 +59,40 @@ function handleInitialize(): InitializeResult {
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleDocumentOpen(event: TextDocumentChangeEvent<TextDocument>) {
|
||||||
|
const document = event.document
|
||||||
|
const tree = parser.parse(document.getText())
|
||||||
|
documentTrees.set(document.uri, tree)
|
||||||
|
}
|
||||||
|
|
||||||
function handleSemanticTokens(params: any) {
|
function handleSemanticTokens(params: any) {
|
||||||
const document = documents.get(params.textDocument.uri)
|
const document = documents.get(params.textDocument.uri)
|
||||||
if (!document) return { data: [] }
|
if (!document) return { data: [] }
|
||||||
|
|
||||||
const data = buildSemanticTokens(document)
|
const tree = documentTrees.get(params.textDocument.uri)
|
||||||
|
if (!tree) return { data: [] }
|
||||||
|
|
||||||
|
const data = buildSemanticTokens(document, tree)
|
||||||
return { data }
|
return { data }
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleDocumentChange(change: any) {
|
function handleDocumentChange(change: TextDocumentChangeEvent<TextDocument>) {
|
||||||
const textDocument = change.document
|
const document = change.document
|
||||||
const diagnostics = buildDiagnostics(textDocument)
|
|
||||||
connection.sendDiagnostics({ uri: textDocument.uri, diagnostics })
|
// Parse and cache
|
||||||
|
const tree = parser.parse(document.getText())
|
||||||
|
documentTrees.set(document.uri, tree)
|
||||||
|
|
||||||
|
// Build diagnostics using cached tree
|
||||||
|
const diagnostics = buildDiagnostics(document, tree)
|
||||||
|
connection.sendDiagnostics({ uri: document.uri, diagnostics })
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleCompletion(params: any) {
|
function handleDocumentClose(event: TextDocumentChangeEvent<TextDocument>) {
|
||||||
|
documentTrees.delete(event.document.uri)
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleCompletion() {
|
||||||
const keywords = ['if', 'else', 'do', 'end', 'and', 'or', 'true', 'false', 'null']
|
const keywords = ['if', 'else', 'do', 'end', 'and', 'or', 'true', 'false', 'null']
|
||||||
|
|
||||||
return keywords.map((keyword) => ({
|
return keywords.map((keyword) => ({
|
||||||
|
|
@ -84,8 +106,13 @@ function handleParseTree(params: { uri: string }) {
|
||||||
const document = documents.get(params.uri)
|
const document = documents.get(params.uri)
|
||||||
if (!document) return 'Document not found'
|
if (!document) return 'Document not found'
|
||||||
|
|
||||||
|
const tree = documentTrees.get(params.uri)
|
||||||
|
if (!tree) {
|
||||||
|
connection.console.error(`🦐 No cached tree for ${params.uri}`)
|
||||||
|
return 'No cached parse tree available'
|
||||||
|
}
|
||||||
|
|
||||||
const text = document.getText()
|
const text = document.getText()
|
||||||
const tree = parser.parse(text)
|
|
||||||
const cursor = tree.cursor()
|
const cursor = tree.cursor()
|
||||||
|
|
||||||
let formatted = ''
|
let formatted = ''
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user