@likec4/language-server 1.59.0 → 1.59.1

package/dist/chunks/module.mjs

@@ -6,7 +6,7 @@ import { BuildDocuments, ChangeView, DidChangeModelNotification, DidChangeProjec
 import { DefaultMap, DefaultWeakMap, MultiMap, ancestorsFqn, compareNatural, compareNaturalHierarchically, ifilter, invariant, isNonEmptyArray, isString, nameFromFqn, nonNullable, nonexhaustive, onNextTick, parentFqn, sortNaturalByFqn, sortParentsFirst, stringHash, toArray } from "@likec4/core/utils";
 import { loggable, wrapError } from "@likec4/log";
 import { AstUtils, Cancellation, ContextCache, CstUtils, DefaultDocumentValidator, DefaultIndexManager, DefaultLangiumDocuments, DefaultNameProvider, DefaultScopeComputation, DefaultScopeProvider, DefaultValueConverter, DefaultWorkspaceManager, Disposable, DocumentState, EMPTY_SCOPE, EMPTY_STREAM, GrammarAST, GrammarUtils, JSDocDocumentationProvider, MapScope, MultiMap as MultiMap$1, StreamScope, TextDocument, URI, UriUtils, ValueConverter, WorkspaceCache, inject, interruptAndCheck, isAstNode, isNamed, isOperationCancelled, stream } from "langium";
-import { cleanDoubleSlashes, hasLeadingSlash, hasProtocol, isRelative, joinRelativeURL, joinURL, withTrailingSlash, withoutBase, withoutLeadingSlash, withoutProtocol, withoutTrailingSlash } from "ufo";
+import { cleanDoubleSlashes, hasLeadingSlash, hasProtocol, isRelative, joinRelativeURL, joinURL, withTrailingSlash, withoutBase, withoutLeadingSlash, withoutTrailingSlash } from "ufo";
 import { anyPass, clamp, entries, filter, find, findLast, first, flatMap, forEach, forEachObj, funnel, groupBy, hasAtLeast, identity, indexBy, isArray, isBoolean, isDefined, isEmpty, isEmptyish, isNonNullish, isNot, isNullish, isNumber, isPromise, isString as isString$1, isTruthy, keys, last, map, mapToObj, mapValues, omitBy, once, only, pipe, piped, prop, purry, reduce, sort, unique, uniqueBy, values } from "remeda";
 import * as c4 from "@likec4/core";
 import { DefaultMap as DefaultMap$1, Fqn, FqnExpr, FqnRef, GlobalFqn, LinkedList, RelationExpr, _layout, _stage, _type, ancestorsFqn as ancestorsFqn$1, applyCachedLayout, applyManualLayout, calcDriftsFromSnapshot, exact, invariant as invariant$1, isAncestor, isAndOperator, isAnyOf, isDeploymentNode, isElementView, isGlobalFqn, isNonEmptyArray as isNonEmptyArray$1, isOrOperator, isSameHierarchy, nameFromFqn as nameFromFqn$1, nonNullable as nonNullable$1, nonexhaustive as nonexhaustive$1, preferSummary, splitGlobalFqn } from "@likec4/core";
@@ -375,6 +375,14 @@ function normalizeUri(uri) {
 	}
 	return uri.toString();
 }
+const windowsDrivePath = /^\/?([A-Za-z]):(?=\/|$)/;
+function normalizeWindowsDrivePath(path) {
+	return path.replace(windowsDrivePath, (_, drive) => `/${drive.toLowerCase()}:`);
+}
+function uriPathForMatcher(uri) {
+	if (URI.isUri(uri)) return normalizeWindowsDrivePath(uri.path);
+	return normalizeWindowsDrivePath(URI.parse(uri).path);
+}
 /**
 * Compare function to ensure consistent order
 */
@@ -402,7 +410,7 @@ function _isInScope(project, docUri) {
 	return docUri.startsWith(project.folder) || (project.includePaths?.some(isParentFolderFor(docUri)) ?? false);
 }
 function _excludes(project, docUri) {
-	return project.exclude?.(withoutProtocol(docUri)) ?? false;
+	return project.exclude?.(uriPathForMatcher(docUri)) ?? false;
 }
 function includes(...args) {
 	return purry(_includes, args);
@@ -439,7 +447,7 @@ const DefaultProject = {
 	}
 };
 function isExcludedByDefault(uri) {
-	return DefaultProject.exclude(withoutProtocol(uri));
+	return DefaultProject.exclude(uriPathForMatcher(uri));
 }
 /**
 * Parses the given options and returns an object with the following properties:
@@ -542,7 +550,7 @@ var ProjectsManager = class ProjectsManager extends ADisposable {
 	isExcludedByWorkspace(uri) {
 		if (!this.#workspaceExclude) return false;
 		if (URI.isUri(uri)) uri = normalizeUri(uri);
-		return this.#workspaceExclude(withoutProtocol(uri));
+		return this.#workspaceExclude(uriPathForMatcher(uri));
 	}
 	/**
 	* Updates the workspace-level exclude patterns from VS Code settings.
@@ -555,6 +563,7 @@ var ProjectsManager = class ProjectsManager extends ADisposable {
 				return;
 			}
 			const normalizedPatterns = pipe(patterns, filter(isTruthy), map((p) => {
+				p = normalizeWindowsDrivePath(p);
 				if (!isAbsolute(p) && !p.startsWith("**")) p = joinURL("**", p);
 				return p;
 			}));
@@ -925,7 +934,7 @@ var ProjectsManager = class ProjectsManager extends ADisposable {
 		if (isNullish(exclude)) project.exclude = DefaultProject.exclude;
 		else if (hasAtLeast(exclude, 1)) project.exclude = picomatch([project.folderUri, ...map(project.includePaths ?? [], prop("uri"))].flatMap((root) => map(exclude, (p) => {
 			if (!isRelative(p) && !p.startsWith("**")) p = joinURL("**", p);
-			return cleanDoubleSlashes(joinRelativeURL(root.path, p));
+			return cleanDoubleSlashes(joinRelativeURL(uriPathForMatcher(root), p));
 		})), {
 			contains: true,
 			dot: true
@@ -1050,7 +1059,7 @@ var LikeC4WorkspaceManager = class extends DefaultWorkspaceManager {
 	*/
 	async scanProjectIncludePaths() {
 		const includePaths = this.services.workspace.ProjectsManager.getAllIncludePaths();
-		if (hasAtLeast(includePaths, 1)) return [];
+		if (!hasAtLeast(includePaths, 1)) return [];
 		const isNotExcludedByWorkspace = isNot((f) => this.services.workspace.ProjectsManager.isExcludedByWorkspace(f.uri));
 		const foundFiles = [];
 		for (const { projectId, includePath, includeConfig } of includePaths) try {
@@ -7188,7 +7197,7 @@ var LikeC4ScopeComputation = class extends DefaultScopeComputation {
 					if (isTruthy(spec.tag.name)) docExports.push(this.descriptions.createDescription(spec.tag, spec.tag.name, document), this.descriptions.createDescription(spec.tag, "#" + spec.tag.name, document));
 					continue;
 				case isSpecificationRelationshipKind(spec):
-					if (isTruthy(spec.kind.name)) docExports.push(this.descriptions.createDescription(spec.kind, spec.kind.name, document), this.descriptions.createDescription(spec.kind, "." + spec.kind.name, document));
+					if (isTruthy(spec.kind.name)) docExports.push(this.descriptions.createDescription(spec.kind, spec.kind.name, document));
 					continue;
 				case isSpecificationColor(spec):
 					if (isTruthy(spec.name.name)) docExports.push(this.descriptions.createDescription(spec.name, spec.name.name, document));