Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 49 additions & 13 deletions server/src/completion.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,66 @@
import {
CompletionItem,
CompletionItemKind,
InsertTextFormat,
InsertTextMode,
TextDocumentPositionParams,
TextDocuments,
} from 'vscode-languageserver/node.js';
import { documentation } from './information/documentation.js';
import { details } from './information/details.js';
import { allKeywords, components, keywords } from './types/keywords.js';
import { TextDocument } from 'vscode-languageserver-textdocument';

//this would come from package
const StandardVOCompletion = {
prefixes: ['StandardVO'],
// , 'StandardVO.Currency'],
completions: {
StandardVO: ['Currency'],
// 'StandardVO.Currency': ['Value', 'Errors'],
},
};

export class CompletionItemProvider {
public static onCompletion(_textDocumentPosition: TextDocumentPositionParams) {
return allKeywords.map((symbol) => ({
label: symbol,
kind: CompletionItemKind.Keyword,
data: 1,
}));
public static onCompletion(
documents: TextDocuments<TextDocument>,
_textDocumentPosition: TextDocumentPositionParams,
) {
const document = documents.get(_textDocumentPosition.textDocument.uri);
let text = documents.get(_textDocumentPosition.textDocument.uri).getText();
let position = _textDocumentPosition.position;
const offset = document.offsetAt(position);
for (const prefix of StandardVOCompletion.prefixes) {
const linePrefix = text.slice(offset - prefix.length - 1, offset);
if (linePrefix.endsWith(prefix + '.')) {
return [
...StandardVOCompletion.completions[prefix].map((symbol) => ({
label: symbol,
kind: CompletionItemKind.Keyword,
data: 2,
//we could add snippets too
})),
];
}
}
return [
...allKeywords.map((symbol) => ({
label: symbol,
kind: CompletionItemKind.Keyword,
data: 1,
})),
];
}

public static onCompletionResolve(item: CompletionItem): CompletionItem {
const label: string = item.label;
if (documentation[item.label as keyof typeof documentation]) {
item.documentation = documentation[item.label as keyof typeof documentation];
if (item.data == 1) {
if (documentation[item.label as keyof typeof documentation]) {
item.documentation = documentation[item.label as keyof typeof documentation];
}
if (details[item.label as keyof typeof details]) {
item.detail = details[item.label as keyof typeof details];
}
}
if (details[item.label as keyof typeof details]) {
item.detail = details[item.label as keyof typeof details];
}

return item;
}
}
2 changes: 1 addition & 1 deletion server/src/lsp-connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class LspConnection {

this.documents.onDidClose(server.onDidClose.bind(server));
this.documents.onDidChangeContent(server.onDidChangeContent.bind(server));
this.connection.onCompletion(server.completion.bind(server));
this.connection.onCompletion(server.completion.bind(server, this.documents));
this.connection.onCompletionResolve(server.completionResolve.bind(server));
return this;
}
Expand Down
1 change: 1 addition & 0 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class BitloopsServer {
// Tell the client that this server supports code completion.
completionProvider: {
resolveProvider: true,
triggerCharacters: ['.'],
},
},
};
Expand Down
5 changes: 5 additions & 0 deletions server/src/types/keywords.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export const components = {
GraphQLController: 'GraphQLController',
RESTController: 'RESTController',
PackagePort: 'PackagePort',
Command: 'Command',
Query: 'Query',
};

export const keywords = [
Expand Down Expand Up @@ -139,6 +141,9 @@ export const keywords = [
'Operations',
'Mutation',
'Query',

'StandardVO',
];

// 'StandardVO',
export const allKeywords = Array.from(new Set([...Object.values(components), ...keywords]));
4 changes: 2 additions & 2 deletions syntaxes/bitloops.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@
"patterns": [
{
"name": "keyword.control.templateClass.bitloops",
"match": "\\b(Config|(REST\\.Methods)|REST|DTO|UseCase|Root|Entity|Rule|OK|Errors|ValueObject|Props|ReadModel|RESTController|RESTRouter|GraphQLController|Feature|Mapper|RepoPort|RepoAdapter|PackagePort|PackageAdapter|ApplicationErrors|DomainErrors|DomainError|ApplicationError)\\b"
"match": "\\b(Config|(REST\\.Methods)|REST|DTO|UseCase|Root|Entity|Rule|OK|Errors|ValueObject|Props|ReadModel|RESTController|RESTRouter|GraphQLController|Feature|Mapper|RepoPort|RepoAdapter|PackagePort|PackageAdapter|ApplicationErrors|DomainErrors|DomainError|ApplicationError|Command|Query|CommandHandler|QueryHandler)\\b"
}
]
},
"myClasses": {
"patterns": [
{
"name": "entity.name.class.bitloops",
"match": "\\b[A-Z]+[a-zA-Z0-9]*(DTO|UseCase|Aggregate|VO|Entity|Error|Controller|Router|Feature|Mapper|RepoPort|RepoAdapter|PackagePort|PackageAdapter|Error)\\b"
"match": "\\b[A-Z]+[a-zA-Z0-9]*(DTO|UseCase|Aggregate|VO|Entity|Error|Controller|Router|Feature|Mapper|RepoPort|RepoAdapter|PackagePort|PackageAdapter|Error|Props|Rule|Command|Query|ReadModel|CommandHandler|QueryHandler)\\b"
}
]
},
Expand Down