M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-07 17:46:38 +03:00
parent 6537eebe09
commit e7f661f7ad
87 changed files with 279 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/IntervalDirective.java
View File

@@ -1,5 +1,5 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
public class IntervalDirective extends BaseDirective {
protected String prefix;
@@ -19,9 +19,9 @@ public class IntervalDirective extends BaseDirective {
}
@Override
public String getReplacementText() {
prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = name.getText();
suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", "");
if ((!ps.isEmpty()) && (ps.charAt(0) != ','))

6
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/SpecDirective.java
View File

@@ -1,5 +1,5 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
//промежуточный тип. относится ко всем директивам со скобками и требующим запятых.
public class SpecDirective extends BaseDirective {
@@ -16,9 +16,9 @@ public class SpecDirective extends BaseDirective {
}
@Override
public String getReplacementText() {
prefix = Utils.pack(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
prefix = CommonUtils.removeRedundantSpaces(getCaretInfo().before.substring(0, getCaretInfo().before.length() - getCaretInfo().prefix_word.length()));
word = get_word();
suffix = Utils.pack(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
suffix = CommonUtils.removeRedundantSpaces(getCaretInfo().after.substring(getCaretInfo().suffix_word.length()));
String pp = prefix.replace(" ", "");
String ps = suffix.replace(" ", "");
if (!pp.isEmpty() && (pp.charAt(pp.length() - 1) != ',') && (pp.charAt(pp.length() - 1) != '('))