@likec4/language-server 1.8.1 → 1.10.0

package/src/generated-lib/icons.ts

@@ -1,4 +1,4 @@
-export const LibIcons = `likec4lib {
+export const LibIcons: string = `likec4lib {
   icons {
     aws:activate
     aws:alexa-for-business

package/src/like-c4.langium

@@ -31,12 +31,16 @@ Tag:
 RelationshipKind:
   name=Id;
 
+CustomColor:
+  name=CustomColorId;
+
 SpecificationRule:
   name='specification' '{'
     (
       elements+=SpecificationElementKind |
       tags+=SpecificationTag |
-      relationships+=SpecificationRelationshipKind
+      relationships+=SpecificationRelationshipKind |
+      colors+=SpecificationColor
     )*
   '}';
 
@@ -54,6 +58,9 @@ SpecificationElementStringProperty:
 SpecificationTag:
   'tag' tag=Tag;
 
+SpecificationColor:
+  'color' name=CustomColor color=CustomColorValue;
+
 SpecificationRelationshipKind:
   'relationship' kind=RelationshipKind ('{'
     props+=(
@@ -155,7 +162,12 @@ RelationBody: '{'
 ;
 
 RelationProperty:
-  RelationStringProperty | RelationStyleProperty |  LinkProperty | MetadataProperty;
+  RelationStringProperty |
+  RelationNavigateToProperty |
+  RelationStyleProperty |
+  LinkProperty |
+  MetadataProperty
+;
 
 RelationStringProperty:
   key=('title' | 'technology' | 'description') ':'? value=String ';'?;
@@ -176,7 +188,7 @@ MetadataBody: '{'
 ;
 
 MetadataAttribute:
-  key=IdTerminal value=String
+  key=IdTerminal ':'? value=String ';'?
 ;
 
 // Views -------------------------------------
@@ -208,6 +220,9 @@ ViewRef:
 ElementViewRef:
   view=[ElementView];
 
+DynamicViewRef:
+  view=[DynamicView];
+
 ElementViewBody: '{'
   tags=Tags?
   props+=ViewProperty*
@@ -218,8 +233,11 @@ ElementViewBody: '{'
 DynamicViewBody: '{'
   tags=Tags?
   props+=ViewProperty*
-  (steps+=DynamicViewStep | rules+=DynamicViewRule)*
-  '}'
+  (
+    steps+=(DynamicViewParallelSteps | DynamicViewStep) |
+    rules+=DynamicViewRule
+  )*
+'}'
 ;
 
 
@@ -230,7 +248,8 @@ type StringProperty =
   MetadataAttribute |
   SpecificationElementStringProperty |
   SpecificationRelationshipStringProperty |
-  NotationProperty
+  NotationProperty |
+  NotesProperty
 ;
 
 ViewProperty:
@@ -255,6 +274,12 @@ DynamicViewRule:
   ViewRuleAutoLayout
 ;
 
+DynamicViewParallelSteps:
+  ('parallel'|'par') '{'
+    (steps+=DynamicViewStep)*
+  '}'
+;
+
 DynamicViewStep:
   source=ElementRef
   (isBackward?='<-' |  '->' | '-[' kind=[RelationshipKind] ']->' | kind=[RelationshipKind:DotId] )
@@ -419,6 +444,9 @@ ViewRuleAutoLayout:
 NotationProperty:
   key='notation' ':'? value=String ';'?
 ;
+NotesProperty:
+  key='notes' ':'? value=String ';'?
+;
 
 CustomElementProperties: '{'
   props+=(
@@ -432,8 +460,10 @@ CustomElementProperties: '{'
 
 CustomRelationProperties: '{'
   props+=(
+    RelationNavigateToProperty |
     RelationStringProperty |
     NotationProperty |
+    NotesProperty |
     RelationshipStyleProperty
   )*
 '}'
@@ -442,12 +472,15 @@ CustomRelationProperties: '{'
 NavigateToProperty:
   key='navigateTo' value=ViewRef;
 
+RelationNavigateToProperty:
+  key='navigateTo' value=DynamicViewRef;
+
 // Common properties -------------------------------------
 
 LinkProperty:
   key='link' ':'? value=Uri title=String? ';'?;
 ColorProperty:
-  key='color' ':'? value=ThemeColor ';'?;
+  key='color' ':'? (themeColor=ThemeColor | customColor=[CustomColor:CustomColorId]) ';'?;
 
 OpacityProperty:
   key='opacity' ':'? value=Percent ';'?;
@@ -513,6 +546,9 @@ ThemeColor returns string:
 ElementShape returns string:
   'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
 
+CustomColorValue returns string:
+  Hash (Id | Hex);
+
 IconId returns string:
   LIB_ICON;
 
@@ -525,6 +561,9 @@ TagId returns string:
 DotId returns string:
   Dot Id;
 
+CustomColorId returns string:
+  IdTerminal | ElementShape | ArrowType | LineOptions | 'element' | 'model';
+
 Id returns string:
   IdTerminal | ElementShape | ThemeColor | ArrowType | LineOptions | 'element' | 'model';
 
@@ -552,7 +591,8 @@ fragment IsEqual:
 // Comments
 hidden terminal BLOCK_COMMENT: /\/\*[\s\S]*?\*\//;
 hidden terminal LINE_COMMENT: /\/\/[^\n\r]*/;
-hidden terminal WS: /\s+/;
+hidden terminal WS: /[\t ]+/;
+hidden terminal NL: /[\r\n]+/;
 
 // -----------------------------------
 // Terminals
@@ -580,3 +620,4 @@ terminal String: /"[^"]*"|'[^']*'/;
 // terminal  TagId: HASH LETTER (LETTER | DIGIT | UNDERSCORE | DASH)*;
 // terminal IdTerminal: (LETTER | UNDERSCORE+ (LETTER | DIGIT)) (LETTER | DIGIT | UNDERSCORE | DASH)*;
 terminal IdTerminal:  /[_]*[a-zA-Z][-\w]*/;
+terminal Hex: /[a-zA-Z0-9]+/;

package/src/likec4lib.ts

@@ -1,7 +1,6 @@
 import { LibIcons } from './generated-lib/icons'
 
-export const Scheme = 'likec4-lib'
-export const Path = `/icons.c4`
-export const Uri = `${Scheme}://${Path}`
+export const Scheme = 'likec4builtin'
+export const Uri = `${Scheme}:///likec4/lib/icons.c4`
 
 export { LibIcons as Content }

package/src/logger.ts

@@ -65,14 +65,22 @@ export function logToLspConnection(connection: Connection): void {
       }
       const message = parts.join(' ')
       switch (true) {
+        case level >= LogLevels.trace: {
+          connection.tracer.log(message)
+          break
+        }
         case level >= LogLevels.debug: {
           connection.console.debug(message)
           break
         }
-        case level >= LogLevels.log: {
+        case level >= LogLevels.info: {
           connection.console.info(message)
           break
         }
+        case level >= LogLevels.log: {
+          connection.console.log(message)
+          break
+        }
         case level >= LogLevels.warn: {
           connection.console.warn(message)
           break

package/src/lsp/DocumentLinkProvider.ts

@@ -1,10 +1,10 @@
 import type { LangiumDocument, MaybePromise } from 'langium'
 import { AstUtils, GrammarUtils } from 'langium'
 import type { DocumentLinkProvider } from 'langium/lsp'
-import { hasProtocol, isRelative, withBase } from 'ufo'
+import { hasLeadingSlash, hasProtocol, isRelative, withoutBase, withoutLeadingSlash } from 'ufo'
 import type { DocumentLink, DocumentLinkParams } from 'vscode-languageserver'
 import { ast, isParsedLikeC4LangiumDocument } from '../ast'
-import { logError } from '../logger'
+import { logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 
 export class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
@@ -20,34 +20,46 @@ export class LikeC4DocumentLinkProvider implements DocumentLinkProvider {
     }
     return AstUtils.streamAllContents(doc.parseResult.value)
       .filter(ast.isLinkProperty)
-      .flatMap((n): DocumentLink | Iterable<DocumentLink> => {
+      .map((n): DocumentLink | null => {
         try {
           const range = GrammarUtils.findNodeForProperty(n.$cstNode, 'value')?.range
-          if (!range) {
-            return []
-          }
           const target = this.resolveLink(doc, n.value)
-          return {
-            range,
-            target
+          if (range && hasProtocol(target)) {
+            return {
+              range,
+              target
+            }
           }
         } catch (e) {
-          logError(e)
-          return []
+          logWarnError(e)
         }
+        return null
       })
+      .nonNullable()
       .toArray()
   }
 
   resolveLink(doc: LangiumDocument, link: string): string {
-    if (hasProtocol(link)) {
+    if (hasProtocol(link) || hasLeadingSlash(link)) {
       return link
     }
+    const base = isRelative(link)
+      ? new URL(doc.uri.toString(true))
+      : this.services.shared.workspace.WorkspaceManager.workspaceURL
+    return new URL(link, base).toString()
+  }
+
+  relativeLink(doc: LangiumDocument, link: string): string | null {
+    if (hasLeadingSlash(link)) {
+      return withoutLeadingSlash(link)
+    }
     if (isRelative(link)) {
       const base = new URL(doc.uri.toString(true))
-      return new URL(link, base).toString()
+      const linkURL = new URL(link, base).toString()
+      return withoutLeadingSlash(
+        withoutBase(linkURL, this.services.shared.workspace.WorkspaceManager.workspaceURL.toString())
+      )
     }
-    const workspace = this.services.shared.workspace.WorkspaceManager.workspaceURL
-    return withBase(link, workspace.toString())
+    return null
   }
 }

package/src/lsp/RenameProvider.ts

@@ -0,0 +1,8 @@
+import { DefaultRenameProvider } from 'langium/lsp'
+import type { LikeC4Services } from '../module'
+
+export class LikeC4RenameProvider extends DefaultRenameProvider {
+  constructor(services: LikeC4Services) {
+    super(services)
+  }
+}

package/src/lsp/SemanticTokenProvider.ts

@@ -42,7 +42,7 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         type: SemanticTokenTypes.function
       })
     }
-    if (ast.isNavigateToProperty(node)) {
+    if (ast.isNavigateToProperty(node) || ast.isRelationNavigateToProperty(node)) {
       acceptor({
         node,
         property: 'key',
@@ -118,6 +118,23 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
       })
       return !node.parent ? 'prune' : undefined
     }
+    if (ast.isSpecificationColor(node)) {
+      acceptor({
+        node,
+        keyword: 'color',
+        type: SemanticTokenTypes.keyword
+      })
+      acceptor({
+        node,
+        property: 'name',
+        type: SemanticTokenTypes.type,
+        modifier: [
+          SemanticTokenModifiers.declaration,
+          SemanticTokenModifiers.readonly
+        ]
+      })
+      return
+    }
     if (ast.isSpecificationElementKind(node) || ast.isSpecificationRelationshipKind(node)) {
       acceptor({
         node,
@@ -188,7 +205,8 @@ export class LikeC4SemanticTokenProvider extends AbstractSemanticTokenProvider {
         acceptor({
           node,
           property: 'libicon',
-          type: SemanticTokenTypes.enum
+          type: SemanticTokenTypes.enum,
+          modifier: [SemanticTokenModifiers.defaultLibrary]
         })
       }
       return 'prune'

package/src/lsp/index.ts

@@ -4,4 +4,5 @@ export * from './DocumentHighlightProvider'
 export * from './DocumentLinkProvider'
 export * from './DocumentSymbolProvider'
 export * from './HoverProvider'
+// export * from './RenameProvider'
 export * from './SemanticTokenProvider'

package/src/model/fqn-computation.ts

@@ -1,8 +1,10 @@
-import { AsFqn, type c4, nonexhaustive } from '@likec4/core'
+import { AsFqn, nonexhaustive } from '@likec4/core'
+import type * as c4 from '@likec4/core'
 import { type AstNodeDescription, type AstNodeLocator, AstUtils, CstUtils, GrammarUtils, MultiMap } from 'langium'
-import { isEmpty, isNullish as isNil } from 'remeda'
+import { isDefined, isEmpty } from 'remeda'
 import { ast, ElementOps, type LikeC4LangiumDocument } from '../ast'
 import { getFqnElementRef } from '../elementRef'
+import { logError } from '../logger'
 import type { LikeC4Services } from '../module'
 
 const { findNodeForProperty } = GrammarUtils
@@ -41,29 +43,37 @@ export function computeDocumentFqn(document: LikeC4LangiumDocument, services: Li
   const traverseStack: TraversePair[] = elements.map(el => [el, null])
   let pair
   while ((pair = traverseStack.shift())) {
-    const [el, parent] = pair
-    if (ast.isRelation(el)) {
-      continue
-    }
-    if (ast.isExtendElement(el)) {
-      if (!isNil(el.body) && !isEmpty(el.body.elements)) {
-        const fqn = getFqnElementRef(el.element)
-        el.body.elements.forEach(child => traverseStack.push([child, fqn]))
+    try {
+      const [el, parent] = pair
+      if (ast.isRelation(el)) {
+        continue
       }
-      continue
-    }
-    if (ast.isElement(el)) {
-      const fqn = AsFqn(el.name, parent)
-      c4fqnIndex.add(fqn, {
-        ...toAstNodeDescription(locator, el, document),
-        fqn
-      })
-      ElementOps.writeId(el, fqn)
-      if (!isNil(el.body) && !isEmpty(el.body.elements)) {
-        el.body.elements.forEach(child => traverseStack.push([child, fqn]))
+      if (ast.isExtendElement(el)) {
+        if (isDefined(el.body) && !isEmpty(el.body.elements)) {
+          const fqn = getFqnElementRef(el.element)
+          for (const child of el.body.elements) {
+            traverseStack.push([child, fqn])
+          }
+        }
+        continue
+      }
+      if (ast.isElement(el)) {
+        const fqn = AsFqn(el.name, parent)
+        c4fqnIndex.add(fqn, {
+          ...toAstNodeDescription(locator, el, document),
+          fqn
+        })
+        ElementOps.writeId(el, fqn)
+        if (isDefined(el.body) && !isEmpty(el.body.elements)) {
+          for (const child of el.body.elements) {
+            traverseStack.push([child, fqn])
+          }
+        }
+        continue
       }
-      continue
+      nonexhaustive(el)
+    } catch (e) {
+      logError(e)
     }
-    nonexhaustive(el)
   }
 }

package/src/model/fqn-index.ts

@@ -4,7 +4,7 @@ import type { AstNodeDescription, LangiumDocuments, Stream } from 'langium'
 import { DocumentState, DONE_RESULT, MultiMap, stream, StreamImpl } from 'langium'
 import type { ast, DocFqnIndexAstNodeDescription, FqnIndexedDocument } from '../ast'
 import { ElementOps, isFqnIndexedDocument, isLikeC4LangiumDocument } from '../ast'
-import { logError, logger } from '../logger'
+import { logger, logWarnError } from '../logger'
 import type { LikeC4Services } from '../module'
 import { printDocs } from '../utils/printDocs'
 import { computeDocumentFqn } from './fqn-computation'
@@ -26,7 +26,6 @@ export class FqnIndex {
     services.shared.workspace.DocumentBuilder.onBuildPhase(
       DocumentState.IndexedContent,
       async (docs, _cancelToken) => {
-        logger.debug(`[FqnIndex] onIndexedContent ${docs.length}:\n` + printDocs(docs))
         for (const doc of docs) {
           if (isLikeC4LangiumDocument(doc)) {
             delete doc.c4fqnIndex
@@ -37,11 +36,11 @@ export class FqnIndex {
             try {
               computeDocumentFqn(doc, services)
             } catch (e) {
-              logError(e)
+              logWarnError(e)
             }
           }
         }
-        return Promise.resolve()
+        return await Promise.resolve()
       }
     )
     logger.debug(`[FqnIndex] Created`)
@@ -51,29 +50,14 @@ export class FqnIndex {
     return this.langiumDocuments.all.filter(isFqnIndexedDocument)
   }
 
-  private entries(filterByFqn?: (fqn: Fqn) => boolean): Stream<DocFqnIndexAstNodeDescription> {
+  private entries(filterByFqn: (fqn: Fqn) => boolean): Stream<DocFqnIndexAstNodeDescription> {
     return this.documents.flatMap(doc => {
-      if (filterByFqn) {
-        return doc.c4fqnIndex.keys().filter(filterByFqn).flatMap(fqn => doc.c4fqnIndex.get(fqn))
-      }
-      return doc.c4fqnIndex.values()
+      return doc.c4fqnIndex.keys().filter(filterByFqn).flatMap(fqn => doc.c4fqnIndex.get(fqn))
     })
   }
 
   public getFqn(el: ast.Element): Fqn | null {
     return ElementOps.readId(el) ?? null
-    // let fqn = ElementOps.readId(el) ?? null
-    // if (fqn) {
-    //   const doc = getDocument(el)
-    //   if (isFqnIndexedDocument(doc) && doc.c4fqns.has(fqn)) {
-    //     return fqn
-    //   }
-    //   const path = this.services.workspace.AstNodeLocator.getAstNodePath(el)
-    //   logError(`Clean cached FQN ${fqn} at ${path}`)
-    //   ElementOps.writeId(el, null)
-    //   fqn = null
-    // }
-    // return fqn
   }
 
   public byFqn(fqn: Fqn): Stream<AstNodeDescription> {