Move language utils to util/ and separate them out

LeaVerou · DmitrySharabin · commit 564701bd490b · 2025-06-26T23:21:11.000+02:00
diff --git a/src/core/registry.ts b/src/core/registry.ts
@@ -1,6 +1,6 @@
-import { extend } from '../shared/language-util';
 import { kebabToCamelCase } from '../shared/util';
 import { forEach } from '../util/iterables';
+import { extend } from '../util/language-util';
 import type { ComponentProto, Grammar } from '../types';
 import type { Prism } from './prism';
 
diff --git a/src/languages/actionscript.ts b/src/languages/actionscript.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import type { GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/aspnet.ts b/src/languages/aspnet.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import csharp from './csharp';
 import markup from './markup';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
diff --git a/src/languages/birb.ts b/src/languages/birb.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/bison.ts b/src/languages/bison.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import c from './c';
 import type { Grammar, LanguageProto } from '../types';
 
diff --git a/src/languages/c.ts b/src/languages/c.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/cfscript.ts b/src/languages/cfscript.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/chaiscript.ts b/src/languages/chaiscript.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { toArray } from '../util/iterables';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import cpp from './cpp';
 import type { LanguageProto } from '../types';
diff --git a/src/languages/cilkc.ts b/src/languages/cilkc.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import c from './c';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/cilkcpp.ts b/src/languages/cilkcpp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import cpp from './cpp';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/coffeescript.ts b/src/languages/coffeescript.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/cpp.ts b/src/languages/cpp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import c from './c';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/crystal.ts b/src/languages/crystal.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { toArray } from '../util/iterables';
+import { insertBefore } from '../util/language-util';
 import ruby from './ruby';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/csharp.ts b/src/languages/csharp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/cshtml.ts b/src/languages/cshtml.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import csharp from './csharp';
 import markup from './markup';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
diff --git a/src/languages/css.ts b/src/languages/css.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import type { Grammar, LanguageProto } from '../types';
 
 export default {
diff --git a/src/languages/d.ts b/src/languages/d.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/dart.ts b/src/languages/dart.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/firestore-security-rules.ts b/src/languages/firestore-security-rules.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/flow.ts b/src/languages/flow.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { toArray } from '../util/iterables';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import type { GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/fsharp.ts b/src/languages/fsharp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/go.ts b/src/languages/go.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/gradle.ts b/src/languages/gradle.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/graphql.ts b/src/languages/graphql.ts
@@ -1,6 +1,6 @@
-import { withoutTokenize } from '../shared/language-util';
-import type { Prism } from '../core/prism';
+import { withoutTokenize } from '../util/language-util';
 import type { Token } from '../core';
+import type { Prism } from '../core/prism';
 import type { Grammar, LanguageProto } from '../types';
 
 export default {
diff --git a/src/languages/groovy.ts b/src/languages/groovy.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/haml.ts b/src/languages/haml.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import ruby from './ruby';
 import type { Grammar, LanguageProto } from '../types';
 
diff --git a/src/languages/haxe.ts b/src/languages/haxe.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/http.ts b/src/languages/http.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import type { Grammar, LanguageProto } from '../types';
 
 export default {
diff --git a/src/languages/idris.ts b/src/languages/idris.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import haskell from './haskell';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/java.ts b/src/languages/java.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { toArray } from '../util/iterables';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/javadoc.ts b/src/languages/javadoc.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import java from './java';
 import javadoclike from './javadoclike';
 import markup from './markup';
diff --git a/src/languages/javascript.ts b/src/languages/javascript.ts
@@ -1,6 +1,6 @@
-import { insertBefore } from '../shared/language-util';
 import { JS_TEMPLATE, JS_TEMPLATE_INTERPOLATION } from '../shared/languages/patterns';
 import { toArray } from '../util/iterables';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { Grammar, LanguageProto } from '../types';
 
diff --git a/src/languages/jolie.ts b/src/languages/jolie.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/jsdoc.ts b/src/languages/jsdoc.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javadoclike from './javadoclike';
 import javascript from './javascript';
 import typescript from './typescript';
diff --git a/src/languages/jsonp.ts b/src/languages/jsonp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import json from './json';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/jsx.ts b/src/languages/jsx.ts
@@ -1,5 +1,5 @@
 import { getTextContent, Token } from '../core/classes/token';
-import { insertBefore, withoutTokenize } from '../shared/language-util';
+import { insertBefore, withoutTokenize } from '../util/language-util';
 import javascript from './javascript';
 import markup from './markup';
 import type { TokenStream } from '../core/classes/token';
diff --git a/src/languages/kotlin.ts b/src/languages/kotlin.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/latte.ts b/src/languages/latte.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { embeddedIn } from '../shared/languages/templating';
+import { insertBefore } from '../util/language-util';
 import markup from './markup';
 import php from './php';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
diff --git a/src/languages/less.ts b/src/languages/less.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import css from './css';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/markdown.ts b/src/languages/markdown.ts
@@ -1,5 +1,5 @@
 import { getTextContent } from '../core/classes/token';
-import { insertBefore, withoutTokenize } from '../shared/language-util';
+import { insertBefore, withoutTokenize } from '../util/language-util';
 import markup from './markup';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
 import type { Prism } from '../core/prism';
diff --git a/src/languages/markup.ts b/src/languages/markup.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import xml from './xml';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/mongodb.ts b/src/languages/mongodb.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import type { GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/n4js.ts b/src/languages/n4js.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/naniscript.ts b/src/languages/naniscript.ts
@@ -1,5 +1,5 @@
 import { getTextContent } from '../core/classes/token';
-import { withoutTokenize } from '../shared/language-util';
+import { withoutTokenize } from '../util/language-util';
 import type { Grammar, LanguageProto } from '../types';
 import type { Prism } from '../core/prism';
 
diff --git a/src/languages/opencl.ts b/src/languages/opencl.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import c from './c';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/parser.ts b/src/languages/parser.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import markup from './markup';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
 
diff --git a/src/languages/php.ts b/src/languages/php.ts
@@ -1,5 +1,5 @@
-import { insertBefore } from '../shared/language-util';
 import { embeddedIn } from '../shared/languages/templating';
+import { insertBefore } from '../util/language-util';
 import markup from './markup';
 import type { Prism } from '../core/prism';
 import type { Grammar, LanguageProto } from '../types';
diff --git a/src/languages/phpdoc.ts b/src/languages/phpdoc.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javadoclike from './javadoclike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/plsql.ts b/src/languages/plsql.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import sql from './sql';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/processing.ts b/src/languages/processing.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/protobuf.ts b/src/languages/protobuf.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/pug.ts b/src/languages/pug.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import javascript from './javascript';
 import markup from './markup';
 import type { Grammar, GrammarTokens, LanguageProto } from '../types';
diff --git a/src/languages/pure.ts b/src/languages/pure.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import type { Grammar, GrammarToken, LanguageProto } from '../types';
 
 export default {
@@ -85,7 +85,7 @@ export default {
 						'i'
 					),
 					inside: {
-						...(pure['inline-lang'] as GrammarToken).inside as Grammar,
+						...((pure['inline-lang'] as GrammarToken).inside as Grammar),
 						$rest: alias,
 					},
 				},
diff --git a/src/languages/purebasic.ts b/src/languages/purebasic.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/qsharp.ts b/src/languages/qsharp.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/racket.ts b/src/languages/racket.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import scheme from './scheme';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/reason.ts b/src/languages/reason.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/rescript.ts b/src/languages/rescript.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import type { Grammar, LanguageProto } from '../types';
 
 export default {
diff --git a/src/languages/ruby.ts b/src/languages/ruby.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import clike from './clike';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/sass.ts b/src/languages/sass.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import css from './css';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/scala.ts b/src/languages/scala.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import java from './java';
 import type { LanguageProto } from '../types';
 
diff --git a/src/languages/scss.ts b/src/languages/scss.ts
@@ -1,4 +1,4 @@
-import { insertBefore } from '../shared/language-util';
+import { insertBefore } from '../util/language-util';
 import css from './css';
 import type { Grammar, LanguageProto } from '../types';
 
diff --git a/src/languages/solidity.ts b/src/languages/solidity.ts
diff --git a/src/languages/sparql.ts b/src/languages/sparql.ts
diff --git a/src/languages/sqf.ts b/src/languages/sqf.ts
diff --git a/src/languages/squirrel.ts b/src/languages/squirrel.ts
diff --git a/src/languages/treeview.ts b/src/languages/treeview.ts
diff --git a/src/languages/tt2.ts b/src/languages/tt2.ts
diff --git a/src/languages/typescript.ts b/src/languages/typescript.ts
diff --git a/src/languages/v.ts b/src/languages/v.ts
diff --git a/src/languages/vala.ts b/src/languages/vala.ts
diff --git a/src/languages/vbnet.ts b/src/languages/vbnet.ts
diff --git a/src/languages/velocity.ts b/src/languages/velocity.ts
diff --git a/src/languages/wiki.ts b/src/languages/wiki.ts
diff --git a/src/languages/xquery.ts b/src/languages/xquery.ts
diff --git a/src/shared.ts b/src/shared.ts
diff --git a/src/shared/languages/templating.ts b/src/shared/languages/templating.ts
diff --git a/src/util/extend.ts b/src/util/extend.ts
diff --git a/src/util/insert.ts b/src/util/insert.ts
diff --git a/src/util/language-util.ts b/src/util/language-util.ts
diff --git a/src/util/without-tokenize.ts b/src/util/without-tokenize.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { insertBefore } from '../shared/language-util';`
	`1`	`+import { insertBefore } from '../util/language-util';`
`2`	`2`	`import javascript from './javascript';`
`3`	`3`	`import type { GrammarToken, LanguageProto } from '../types';`
`4`	`4`