From 6a9f33b246c531cad76e9b338878631ebb6bae88 Mon Sep 17 00:00:00 2001 From: Ivan Posti Date: Tue, 20 Sep 2022 17:15:50 +0200 Subject: [PATCH] [Grazie][Spellchecker] Update Grazie platform dependencies GitOrigin-RevId: 7204722f09ed7956cb3db28e9540d68625c39de0 --- .../build/CommunityLibraryLicenses.kt | 1 - plugins/grazie/src/intellij.grazie.core.iml | 138 ++++++++++-------- .../com/intellij/grazie/text/CheckerRunner.kt | 6 +- .../grazie/text/CommentProblemFilter.kt | 9 +- spellchecker/intellij.spellchecker.iml | 86 +++++------ 5 files changed, 123 insertions(+), 117 deletions(-) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt index 66ea918d85fa..164685069849 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -312,7 +312,6 @@ object CommunityLibraryLicenses { "ai.grazie.nlp.common", "ai.grazie.nlp.langs", "ai.grazie.nlp.similarity", - "ai.grazie.nlp-tokenizer", "ai.grazie.nlp.detect", "ai.grazie.nlp.stemmer", "ai.grazie.nlp.tokenizer", diff --git a/plugins/grazie/src/intellij.grazie.core.iml b/plugins/grazie/src/intellij.grazie.core.iml index c553ba0ceab3..f2bcdf96d15d 100644 --- a/plugins/grazie/src/intellij.grazie.core.iml +++ b/plugins/grazie/src/intellij.grazie.core.iml @@ -215,109 +215,121 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt index 56dc65960be7..7abcb212e6ed 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CheckerRunner.kt @@ -3,7 +3,7 @@ package com.intellij.grazie.text import ai.grazie.nlp.tokenizer.sentence.RuleSentenceTokenizer -import ai.grazie.utils.mpp.FromResourcesDataLoader +import ai.grazie.nlp.tokenizer.sentence.SRXRules import ai.grazie.utils.toLinkedSet import com.intellij.codeInspection.LocalQuickFix import com.intellij.codeInspection.ProblemDescriptor @@ -213,9 +213,7 @@ class CheckerRunner(val text: TextContent) { TextRange(problem.highlightRanges[0].startOffset, problem.highlightRanges.last().endOffset) companion object { - private val tokenizer by lazy { - runBlocking { RuleSentenceTokenizer.load(FromResourcesDataLoader) } - } + private val tokenizer by lazy { RuleSentenceTokenizer(SRXRules.english) } } } diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CommentProblemFilter.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CommentProblemFilter.kt index c9b0a4ad0319..edbca06d4cd4 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CommentProblemFilter.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/CommentProblemFilter.kt @@ -1,14 +1,13 @@ package com.intellij.grazie.text import ai.grazie.nlp.tokenizer.sentence.RuleSentenceTokenizer -import ai.grazie.utils.mpp.FromResourcesDataLoader +import ai.grazie.nlp.tokenizer.sentence.SRXRules import com.intellij.grazie.text.TextContent.TextDomain.COMMENTS import com.intellij.grazie.text.TextContent.TextDomain.DOCUMENTATION import com.intellij.grazie.utils.Text import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiFile import com.intellij.psi.search.PsiTodoSearchHelper -import kotlinx.coroutines.runBlocking internal class CommentProblemFilter : ProblemFilter() { @@ -55,8 +54,6 @@ internal class CommentProblemFilter : ProblemFilter() { PsiTodoSearchHelper.getInstance(file.project).findTodoItems(file).any { text.intersectsRange(it.textRange) } companion object { - private val tokenizer by lazy { - runBlocking { RuleSentenceTokenizer.load(FromResourcesDataLoader) } - } + private val tokenizer by lazy { RuleSentenceTokenizer(SRXRules.english) } } -} \ No newline at end of file +} diff --git a/spellchecker/intellij.spellchecker.iml b/spellchecker/intellij.spellchecker.iml index 8ee62b2c2e9b..973bf7f60199 100644 --- a/spellchecker/intellij.spellchecker.iml +++ b/spellchecker/intellij.spellchecker.iml @@ -23,169 +23,169 @@ - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +