Small fixes

.vscode/settings.json

@@ -35,5 +35,65 @@
 		"css",
 		"typescriptreact",
 		"javascriptreact"
-	]
+	],
+	"cSpell.words": [
+		"Analyse",
+		"cctext",
+		"clsx",
+		"codemirror",
+		"Constituenta",
+		"cstlist",
+		"csttype",
+		"Debool",
+		"Decart",
+		"exteor",
+		"forceatlas",
+		"Grammeme",
+		"Grammemes",
+		"lezer",
+		"moprho",
+		"nooverlap",
+		"ponomarev",
+		"pyconcept",
+		"pymorphy",
+		"Quantor",
+		"razdel",
+		"reagraph",
+		"Reindex",
+		"rsedit",
+		"rseditor",
+		"rsform",
+		"rsforms",
+		"rslang",
+		"rstemplates",
+		"SIDELIST",
+		"signup",
+		"tanstack",
+		"toastify",
+		"tooltipic",
+		"Viewset",
+		"wordform",
+		"Wordforms",
+		"Булеан",
+		"Бурбаки",
+		"Десинглетон",
+		"компаратив",
+		"конституент",
+		"Конституента",
+		"конституенту",
+		"конституенты",
+		"неинтерпретируемый",
+		"неитерируемого",
+		"пересинтез",
+		"Родоструктурная",
+		"Родоструктурное",
+		"Синглетон",
+		"Терминологизация",
+		"Цермелло",
+		"Экстеор",
+		"Экстеора",
+		"Экстеоре"
+	],
+	"cSpell.language": "en,ru",
+	"cSpell.ignorePaths": ["node_modules/**", "*.json"]
 }

README.md

@@ -51,6 +51,8 @@ This readme file is used mostly to document project dependencies
   - Colorize
   - Code Spell Checker (eng + rus)
   - Backticks
+  - Svg Preview
+  - TODO Highlight v2
   </pre>
 </details>
 

rsconcept/backend/apps/rsform/migrations/0003_alter_constituenta_definition_raw_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2023-12-27 08:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rsform', '0002_librarytemplate'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='constituenta',
+            name='definition_raw',
+            field=models.TextField(blank=True, default='', verbose_name='Текстовое определение (с отсылками)'),
+        ),
+        migrations.AlterField(
+            model_name='constituenta',
+            name='definition_resolved',
+            field=models.TextField(blank=True, default='', verbose_name='Текстовое определение'),
+        ),
+    ]

rsconcept/frontend/src/models/rslangAPI.ts

@@ -99,19 +99,19 @@ export function substituteTemplateArgs(expression: string, args: IArgumentValue[
   }
 }
 
-const ERRCODE_LEXER_MASK = 512;
+const ERROR_LEXER_MASK = 512;
-const ERRCODE_PARSER_MASK = 1024;
+const ERROR_PARSER_MASK = 1024;
-const ERRCODE_TYPE_MASK = 2048;
+const ERROR_SEMANTIC_MASK = 2048;
 
 /**
  * Infers error class from error type (code).
  */
 export function inferErrorClass(error: RSErrorType): RSErrorClass {
-  if ((error & ERRCODE_LEXER_MASK) !== 0) {
+  if ((error & ERROR_LEXER_MASK) !== 0) {
     return RSErrorClass.LEXER;
-  } else if ((error & ERRCODE_PARSER_MASK) !== 0) {
+  } else if ((error & ERROR_PARSER_MASK) !== 0) {
     return RSErrorClass.PARSER;
-  } else if ((error & ERRCODE_TYPE_MASK) !== 0) {
+  } else if ((error & ERROR_SEMANTIC_MASK) !== 0) {
     return RSErrorClass.SEMANTIC;
   } else {
     return RSErrorClass.UNKNOWN;

rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/EditorRSExpression.tsx

@@ -37,7 +37,7 @@ interface EditorRSExpressionProps {
   toggleReset?: boolean
   showList: boolean
   
-  setTypification: (typificaiton: string) => void
+  setTypification: (typification: string) => void
   onChange: (newValue: string) => void
   onToggleList: () => void
 }

rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/RSEditControls.tsx

@@ -90,7 +90,7 @@ interface RSEditorControlsProps {
 function RSEditorControls({ isOpen, disabled, onEdit }: RSEditorControlsProps) {
   return (
   <motion.div
-    className='flex-wrap text-sm divide-solid'
+    className='flex-wrap mt-1 text-sm divide-solid'
     initial={false}
     animate={isOpen ? 'open' : 'closed'}
     variants={animateRSControl}

rsconcept/frontend/src/utils/codemirror.ts

@@ -89,7 +89,7 @@ export function printTree(tree: Tree): string {
 }
 
 /**
- * Reteives a list of all nodes, containing given range and corresponding to a filter.
+ * Retrieves a list of all nodes, containing given range and corresponding to a filter.
 */
 export function findEnvelopingNodes(start: number, finish: number, tree: Tree, filter?: number[]): SyntaxNode[] {
   const result: SyntaxNode[] = [];
@@ -110,7 +110,7 @@ export function findEnvelopingNodes(start: number, finish: number, tree: Tree, f
 }
 
 /**
- * Reteives a list of all nodes, contained in given range and corresponding to a filter.
+ * Retrieves a list of all nodes, contained in given range and corresponding to a filter.
 */
 export function findContainedNodes(start: number, finish: number, tree: Tree, filter?: number[]): SyntaxNode[] {
   const result: SyntaxNode[] = [];