refactor(editor): reorganize grammars

Author: antonreshetov

src/renderer/components/editor/Footer.vue

@@ -3,7 +3,7 @@ import * as Command from '@/components/ui/shadcn/command'
 import * as Popover from '@/components/ui/shadcn/popover'
 import { useEditor, useSnippets } from '@/composables'
 import { Check } from 'lucide-vue-next'
-import { languages } from './languages'
+import { languages } from './grammars/languages'
 
 const { cursorPosition } = useEditor()
 const { selectedSnippetContent, selectedSnippet, updateSnippetContent }

…nderer/components/editor/grammars-aux.ts …nderer/components/editor/grammars/aux.tssrc/renderer/components/editor/grammars-aux.ts renamed to src/renderer/components/editor/grammars/aux.ts src/renderer/components/editor/grammars-aux.ts renamed to src/renderer/components/editor/grammars/aux.ts

@@ -1,202 +1,203 @@
+// Технические грамматики для поддержки синтаксиса внутри других языков или специальных случаев
 export const auxGrammars = [
   {
     source: 'source.sassdoc',
     language: 'sassdoc',
-    grammar: () => import('./grammars/sassdoc.tmLanguage.json'),
+    grammar: () => import('./textmate/sassdoc.tmLanguage.json'),
   },
   {
     source: 'source.scss',
     language: 'scss2',
-    grammar: () => import('./grammars/scss.tmLanguage.json'),
+    grammar: () => import('./textmate/scss.tmLanguage.json'),
   },
   {
     source: 'source.css.nunjucks',
     language: 'css-nunjucks',
-    grammar: () => import('./grammars/css.tmLanguage.json'),
+    grammar: () => import('./textmate/css.tmLanguage.json'),
   },
   {
     source: 'source.less',
     language: 'less2',
-    grammar: () => import('./grammars/less.tmLanguage.json'),
+    grammar: () => import('./textmate/less.tmLanguage.json'),
   },
   {
     source: 'source.postcss',
     language: 'postcss',
-    grammar: () => import('./grammars/postcss.tmLanguage.json'),
+    grammar: () => import('./textmate/postcss.tmLanguage.json'),
   },
   {
     source: 'source.js.jquery',
     languages: 'jquery',
-    grammar: () => import('./grammars/javascript.tmLanguage.json'),
+    grammar: () => import('./textmate/javascript.tmLanguage.json'),
   },
   {
     source: 'source.c++',
     language: 'c++',
-    grammar: () => import('./grammars/cpp.tmLanguage.json'),
+    grammar: () => import('./textmate/cpp.tmLanguage.json'),
   },
   {
     source: 'source.c',
     language: 'c',
-    grammar: () => import('./grammars/cpp.tmLanguage.json'),
+    grammar: () => import('./textmate/cpp.tmLanguage.json'),
   },
   {
     source: 'source.cpp.embedded.macro',
     language: 'c-macro',
-    grammar: () => import('./grammars/cpp.embedded.macro.tmLanguage.json'),
+    grammar: () => import('./textmate/cpp.embedded.macro.tmLanguage.json'),
   },
   {
     source: 'source.x86',
     language: 'x86',
-    grammar: () => import('./grammars/asm.tmLanguage.json'),
+    grammar: () => import('./textmate/asm.tmLanguage.json'),
   },
   {
     source: 'source.x86_64',
     language: 'x86_64',
-    grammar: () => import('./grammars/asm.tmLanguage.json'),
+    grammar: () => import('./textmate/asm.tmLanguage.json'),
   },
   {
     source: 'source.json.comments',
     language: 'json-comment',
-    grammar: () => import('./grammars/jsonc.tmLanguage.json'),
+    grammar: () => import('./textmate/jsonc.tmLanguage.json'),
   },
   {
     source: 'source.js.regexp',
     language: 'regexp-javascript',
-    grammar: () => import('./grammars/regexp-javascript.tmLanguage.json'),
+    grammar: () => import('./textmate/regexp-javascript.tmLanguage.json'),
   },
   {
     source: 'source.regexp.python',
     language: 'regexp-python',
-    grammar: () => import('./grammars/regexp-python.tmLanguage.json'),
+    grammar: () => import('./textmate/regexp-python.tmLanguage.json'),
   },
   {
     source: 'source.regexp.posix',
     language: 'regexp-posix',
-    grammar: () => import('./grammars/regexp-posix.tmLanguage.json'),
+    grammar: () => import('./textmate/regexp-posix.tmLanguage.json'),
   },
   {
     source: 'source.regexp.extended',
     language: 'regexp-extended',
-    grammar: () => import('./grammars/regexp-extended.tmLanguage.json'),
+    grammar: () => import('./textmate/regexp-extended.tmLanguage.json'),
   },
   {
     source: 'source.sy',
     language: 'sy',
-    grammar: () => import('./grammars/syon.tmLanguage.json'),
+    grammar: () => import('./textmate/syon.tmLanguage.json'),
   },
   {
     source: 'text.bibtex',
     language: 'bibtex',
-    grammar: () => import('./grammars/bibtex.tmLanguage.json'),
+    grammar: () => import('./textmate/bibtex.tmLanguage.json'),
   },
   {
     source: 'source.gnuplot',
     language: 'gnuplot',
-    grammar: () => import('./grammars/gnuplot.tmLanguage.json'),
+    grammar: () => import('./textmate/gnuplot.tmLanguage.json'),
   },
   {
     source: 'source.asymptote',
     language: 'asymptote',
-    grammar: () => import('./grammars/asymptote.tmLanguage.json'),
+    grammar: () => import('./textmate/asymptote.tmLanguage.json'),
   },
   {
     source: 'source.arm',
     language: 'arm',
-    grammar: () => import('./grammars/arm.tmLanguage.json'),
+    grammar: () => import('./textmate/arm.tmLanguage.json'),
   },
   {
     source: 'text.elixir',
     language: 'elixir2',
-    grammar: () => import('./grammars/eex.tmLanguage.json'),
+    grammar: () => import('./textmate/eex.tmLanguage.json'),
   },
   {
     source: 'text.html.derivative',
     language: 'html-derivative',
-    grammar: () => import('./grammars/html-derivative.tmLanguage.json'),
+    grammar: () => import('./textmate/html-derivative.tmLanguage.json'),
   },
   {
     source: 'text.tex.markdown_latex_combined',
     language: 'markdown-latex-combined',
-    grammar: () => import('./grammars/markdown-latex-combined.tmLanguage.json'),
+    grammar: () => import('./textmate/markdown-latex-combined.tmLanguage.json'),
   },
   {
     source: 'source.cpp.embedded.latex',
     language: 'cpp-embedded-latex',
-    grammar: () => import('./grammars/cpp-embedded-latex.tmLanguage.json'),
+    grammar: () => import('./textmate/cpp-embedded-latex.tmLanguage.json'),
   },
   {
     source: 'text.log',
     language: 'text-log',
-    grammar: () => import('./grammars/log.tmLanguage.json'),
+    grammar: () => import('./textmate/log.tmLanguage.json'),
   },
   {
     source: 'text.git-rebase',
     language: 'git-rebase',
-    grammar: () => import('./grammars/git-rebase.tmLanguage.json'),
+    grammar: () => import('./textmate/git-rebase.tmLanguage.json'),
   },
   {
     source: 'text.git-commit',
     language: 'git-commit',
-    grammar: () => import('./grammars/git-commit.tmLanguage.json'),
+    grammar: () => import('./textmate/git-commit.tmLanguage.json'),
   },
   {
     source: 'text.html.javadoc',
     language: 'javadoc',
-    grammar: () => import('./grammars/javadoc.tmLanguage.json'),
+    grammar: () => import('./textmate/javadoc.tmLanguage.json'),
   },
   {
     source: 'source.postscript',
     language: 'postscript',
-    grammar: () => import('./grammars/postscript.tmLanguage.json'),
+    grammar: () => import('./textmate/postscript.tmLanguage.json'),
   },
   {
     source: 'etc',
     language: 'etc',
-    grammar: () => import('./grammars/etc.tmLanguage.json'),
+    grammar: () => import('./textmate/etc.tmLanguage.json'),
   },
   {
     source: 'source.cfscript',
     language: 'cfscript',
-    grammar: () => import('./grammars/cfscript.tmLanguage.json'),
+    grammar: () => import('./textmate/cfscript.tmLanguage.json'),
   },
   {
     source: 'text.html.cfm',
     language: 'html-cfm',
-    grammar: () => import('./grammars/html-cfml.tmLanguage.json'),
+    grammar: () => import('./textmate/html-cfml.tmLanguage.json'),
   },
   {
     source: 'source.js.jsx',
     language: 'jsx2',
-    grammar: () => import('./grammars/jsx.tmLanguage.json'),
+    grammar: () => import('./textmate/jsx.tmLanguage.json'),
   },
   {
     source: 'text.html.php',
     language: 'php2',
-    grammar: () => import('./grammars/php.tmLanguage.json'),
+    grammar: () => import('./textmate/php.tmLanguage.json'),
   },
   {
     source: 'source.xq',
     language: 'xq',
-    grammar: () => import('./grammars/xquery.tmLanguage.json'),
+    grammar: () => import('./textmate/xquery.tmLanguage.json'),
   },
   {
     source: 'source.md',
     language: 'md',
-    grammar: () => import('./grammars/markdown.tmLanguage.json'),
+    grammar: () => import('./textmate/markdown.tmLanguage.json'),
   },
   {
     source: 'source.erb',
     language: 'erb',
-    grammar: () => import('./grammars/html-ruby.tmLanguage.json'),
+    grammar: () => import('./textmate/html-ruby.tmLanguage.json'),
   },
   {
     source: 'text.jade',
     language: 'jade',
-    grammar: () => import('./grammars/pug.tmLanguage.json'),
+    grammar: () => import('./textmate/pug.tmLanguage.json'),
   },
   {
     source: 'text.slm',
     language: 'slm',
-    grammar: () => import('./grammars/slm.tmLanguage.json'),
+    grammar: () => import('./textmate/slm.tmLanguage.json'),
   },
 ]

…c/renderer/components/editor/grammars.ts …erer/components/editor/grammars/index.tssrc/renderer/components/editor/grammars.ts renamed to src/renderer/components/editor/grammars/index.ts src/renderer/components/editor/grammars.ts renamed to src/renderer/components/editor/grammars/index.ts

@@ -1,6 +1,6 @@
-import type { GrammarOption, Language } from './types'
+import type { GrammarOption, Language } from '../types'
 import { activateLanguage, addGrammar } from 'codemirror-textmate'
-import { auxGrammars } from './grammars-aux'
+import { auxGrammars } from './aux'
 import { languages } from './languages'
 
 export async function loadGrammars() {