@herb-tools/language-server 0.8.10 → 0.9.1

package/src/service.ts

@@ -12,6 +12,11 @@ import { ConfigService } from "./config_service"
 import { AutofixService } from "./autofix_service"
 import { CodeActionService } from "./code_action_service"
 import { DocumentSaveService } from "./document_save_service"
+import { FoldingRangeService } from "./folding_range_service"
+import { DocumentHighlightService } from "./document_highlight_service"
+import { HoverService } from "./hover_service"
+import { RewriteCodeActionService } from "./rewrite_code_action_service"
+import { CommentService } from "./comment_service"
 
 import { version } from "../package.json"
 
@@ -30,6 +35,11 @@ export class Service {
   configService: ConfigService
   codeActionService: CodeActionService
   documentSaveService: DocumentSaveService
+  foldingRangeService: FoldingRangeService
+  documentHighlightService: DocumentHighlightService
+  hoverService: HoverService
+  rewriteCodeActionService: RewriteCodeActionService
+  commentService: CommentService
 
   constructor(connection: Connection, params: InitializeParams) {
     this.connection = connection
@@ -44,6 +54,11 @@ export class Service {
     this.codeActionService = new CodeActionService(this.project, this.config)
     this.diagnostics = new Diagnostics(this.connection, this.documentService, this.parserService, this.linterService, this.configService)
     this.documentSaveService = new DocumentSaveService(this.connection, this.settings, this.autofixService, this.formattingService)
+    this.foldingRangeService = new FoldingRangeService(this.parserService)
+    this.documentHighlightService = new DocumentHighlightService(this.parserService)
+    this.hoverService = new HoverService(this.parserService)
+    this.rewriteCodeActionService = new RewriteCodeActionService(this.parserService)
+    this.commentService = new CommentService(this.parserService)
 
     if (params.initializationOptions) {
       this.settings.globalSettings = params.initializationOptions as PersonalHerbSettings

package/src/utils.ts

@@ -1,10 +1,6 @@
-import { DiagnosticSeverity } from "vscode-languageserver/node"
+import { DiagnosticSeverity, DiagnosticTag } from "vscode-languageserver/node"
 import type { LintSeverity } from "@herb-tools/linter"
-
-import { Position } from "vscode-languageserver/node"
-
-import type { Range } from "vscode-languageserver/node"
-import type { TextDocument } from "vscode-languageserver-textdocument"
+import type { DiagnosticSeverity as HerbDiagnosticSeverity, DiagnosticTag as HerbDiagnosticTag } from "@herb-tools/core"
 
 export function camelize(value: string) {
   return value.replace(/(?:[_-])([a-z0-9])/g, (_, char) => char.toUpperCase())
@@ -18,7 +14,7 @@ export function capitalize(value: string) {
   return value.charAt(0).toUpperCase() + value.slice(1)
 }
 
-export function lintToDignosticSeverity(severity: LintSeverity): DiagnosticSeverity {
+export function lintToDignosticSeverity(severity: LintSeverity | HerbDiagnosticSeverity): DiagnosticSeverity {
   switch (severity) {
     case "error": return DiagnosticSeverity.Error
     case "warning": return DiagnosticSeverity.Warning
@@ -27,19 +23,14 @@ export function lintToDignosticSeverity(severity: LintSeverity): DiagnosticSever
   }
 }
 
-/**
- * Returns a Range that spans the entire document
- */
-export function getFullDocumentRange(document: TextDocument): Range {
-  const lastLine = document.lineCount - 1
-  const lastLineText = document.getText({
-    start: Position.create(lastLine, 0),
-    end: Position.create(lastLine + 1, 0)
-  })
-  const lastLineLength = lastLineText.length
+export function lintToDignosticTags(tags?: HerbDiagnosticTag[]): DiagnosticTag[] {
+  if (!tags) return []
 
-  return {
-    start: Position.create(0, 0),
-    end: Position.create(lastLine, lastLineLength)
-  }
+  return tags.flatMap(tag => {
+    switch (tag) {
+      case "unnecessary": return [DiagnosticTag.Unnecessary]
+      case "deprecated": return [DiagnosticTag.Deprecated]
+      default: return []
+    }
+  })
 }