jsdoc

Author: DmitrySharabin

src/languages/jsdoc.js

@@ -1,4 +1,3 @@
-import { insertBefore } from '../util/language-util.js';
 import javadoclike from './javadoclike.js';
 import javascript from './javascript.js';
 import typescript from './typescript.js';
@@ -8,85 +7,88 @@ export default {
 	id: 'jsdoc',
 	base: javadoclike,
 	require: [javascript, typescript],
-	grammar ({ base, languages }) {
+	grammar ({ languages }) {
 		const { javascript, typescript } = languages;
 
 		const type = /\{(?:[^{}]|\{(?:[^{}]|\{[^{}]*\})*\})+\}/.source;
 		const parameterPrefix = '(@(?:arg|argument|param|property)\\s+(?:' + type + '\\s+)?)';
 
-		insertBefore(base, 'keyword', {
-			'optional-parameter': {
-				// @param {string} [baz.foo="bar"] foo bar
-				pattern: RegExp(
-					parameterPrefix + /\[(?:(?!\s)[$\w\xA0-\uFFFF.])+(?:=[^[\]]+)?\](?=\s|$)/.source
-				),
+		return {
+			'parameter': {
+				// @param {string} foo - foo bar
+				pattern: RegExp(parameterPrefix + /(?:(?!\s)[$\w\xA0-\uFFFF.])+(?=\s|$)/.source),
 				lookbehind: true,
 				inside: {
-					'parameter': {
-						pattern: /(^\[)[$\w\xA0-\uFFFF\.]+/,
+					'punctuation': /\./,
+				},
+			},
+			$insertBefore: {
+				'keyword': {
+					'optional-parameter': {
+						// @param {string} [baz.foo="bar"] foo bar
+						pattern: RegExp(
+							parameterPrefix +
+								/\[(?:(?!\s)[$\w\xA0-\uFFFF.])+(?:=[^[\]]+)?\](?=\s|$)/.source
+						),
 						lookbehind: true,
 						inside: {
-							'punctuation': /\./,
+							'parameter': {
+								pattern: /(^\[)[$\w\xA0-\uFFFF\.]+/,
+								lookbehind: true,
+								inside: {
+									'punctuation': /\./,
+								},
+							},
+							'code': {
+								pattern: /(=)[\s\S]*(?=\]$)/,
+								lookbehind: true,
+								alias: 'language-javascript',
+								inside: 'javascript',
+							},
+							'punctuation': /[=[\]]/,
 						},
 					},
-					'code': {
-						pattern: /(=)[\s\S]*(?=\]$)/,
-						lookbehind: true,
-						alias: 'language-javascript',
-						inside: 'javascript',
-					},
-					'punctuation': /[=[\]]/,
-				},
-			},
-			'class-name': [
-				{
-					pattern: RegExp(
-						/(@(?:augments|class|extends|interface|memberof!?|template|this|typedef)\s+(?:<TYPE>\s+)?)[A-Z]\w*(?:\.[A-Z]\w*)*/.source.replace(
-							/<TYPE>/g,
-							() => type
-						)
-					),
-					lookbehind: true,
-					inside: {
-						'punctuation': /\./,
-					},
-				},
-				{
-					pattern: RegExp('(@[a-z]+\\s+)' + type),
-					lookbehind: true,
-					inside: {
-						'string': javascript.string,
-						'number': javascript.number,
-						'boolean': javascript.boolean,
-						'keyword': typescript.keyword,
-						'operator': /=>|\.\.\.|[&|?:*]/,
-						'punctuation': /[.,;=<>{}()[\]]/,
-					},
-				},
-			],
-			'example': {
-				pattern: /(@example\s+(?!\s))(?:[^@\s]|\s+(?!\s))+?(?=\s*(?:\*\s*)?(?:@\w|\*\/))/,
-				lookbehind: true,
-				inside: {
-					'code': {
-						pattern: /^([\t ]*(?:\*\s*)?)\S.*$/m,
+					'class-name': [
+						{
+							pattern: RegExp(
+								/(@(?:augments|class|extends|interface|memberof!?|template|this|typedef)\s+(?:<TYPE>\s+)?)[A-Z]\w*(?:\.[A-Z]\w*)*/.source.replace(
+									/<TYPE>/g,
+									() => type
+								)
+							),
+							lookbehind: true,
+							inside: {
+								'punctuation': /\./,
+							},
+						},
+						{
+							pattern: RegExp('(@[a-z]+\\s+)' + type),
+							lookbehind: true,
+							inside: {
+								'string': javascript.string,
+								'number': javascript.number,
+								'boolean': javascript.boolean,
+								'keyword': typescript.keyword,
+								'operator': /=>|\.\.\.|[&|?:*]/,
+								'punctuation': /[.,;=<>{}()[\]]/,
+							},
+						},
+					],
+					'example': {
+						pattern:
+							/(@example\s+(?!\s))(?:[^@\s]|\s+(?!\s))+?(?=\s*(?:\*\s*)?(?:@\w|\*\/))/,
 						lookbehind: true,
-						alias: 'language-javascript',
-						inside: 'javascript',
+						inside: {
+							'code': {
+								pattern: /^([\t ]*(?:\*\s*)?)\S.*$/m,
+								lookbehind: true,
+								alias: 'language-javascript',
+								inside: 'javascript',
+							},
+						},
 					},
 				},
 			},
-		});
-
-		return {
-			'parameter': {
-				// @param {string} foo - foo bar
-				pattern: RegExp(parameterPrefix + /(?:(?!\s)[$\w\xA0-\uFFFF.])+(?=\s|$)/.source),
-				lookbehind: true,
-				inside: {
-					'punctuation': /\./,
-				},
-			},
 		};
 	},
 };