@typespec/prettier-plugin-typespec 0.49.0-dev.0 → 0.49.0-dev.1

package/dist/index.js

@@ -807,7 +807,8 @@ const diagnostics = {
     "invalid-deprecation-argument": {
         severity: "error",
         messages: {
-            default: "Invalid deprecation argument",
+            default: paramMessage `#deprecation directive is expecting a string literal as the message but got a "${"kind"}"`,
+            missing: "#deprecation directive is expecting a message argument but none was provided.",
         },
     },
     "duplicate-deprecation": {
@@ -4301,7 +4302,7 @@ const commentHandler = {
     ownLine: (comment, text, options, ast, isLastComment) => [
         addEmptyInterfaceComment,
         addEmptyModelComment,
-        addStatementDecoratorComment,
+        addCommentBetweenAnnotationsAndNode,
         handleOnlyComments,
     ].some((x) => x({ comment, text, options, ast: ast, isLastComment })),
 };
@@ -4314,7 +4315,7 @@ const commentHandler = {
  *   // My comment
  * }
  */
-function addEmptyInterfaceComment({ comment }) {
+function addEmptyInterfaceComment({ comment, ast }) {
     const { precedingNode, enclosingNode } = comment;
     if (enclosingNode &&
         enclosingNode.kind === SyntaxKind.InterfaceStatement &&
@@ -4327,7 +4328,7 @@ function addEmptyInterfaceComment({ comment }) {
     return false;
 }
 /**
- * When a comment is in between decorators.
+ * When a comment is in between a node and its annotations(Decorator, directives, doc comments).
  *
  * @example
  *
@@ -4337,10 +4338,12 @@ function addEmptyInterfaceComment({ comment }) {
  * model Foo {
  * }
  */
-function addStatementDecoratorComment({ comment }) {
+function addCommentBetweenAnnotationsAndNode({ comment }) {
     const { enclosingNode, precedingNode } = comment;
     if (precedingNode &&
-        precedingNode.kind === SyntaxKind.DecoratorExpression &&
+        (precedingNode.kind === SyntaxKind.DecoratorExpression ||
+            precedingNode.kind === SyntaxKind.DirectiveExpression ||
+            precedingNode.kind === SyntaxKind.Doc) &&
         enclosingNode &&
         (enclosingNode.kind === SyntaxKind.NamespaceStatement ||
             enclosingNode.kind === SyntaxKind.ModelStatement ||
@@ -4671,7 +4674,6 @@ function canAttachComment(node) {
         kind !== SyntaxKind.LineComment &&
         kind !== SyntaxKind.BlockComment &&
         kind !== SyntaxKind.EmptyStatement &&
-        kind !== SyntaxKind.Doc &&
         kind !== SyntaxKind.DocParamTag &&
         kind !== SyntaxKind.DocReturnsTag &&
         kind !== SyntaxKind.DocTemplateTag &&