MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-09 08:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source 
GitOrigin-RevId: 8d08694a575db2ddac4839630e7874fccfbdbee3
This commit is contained in:
Alexey Kudravtsev
2023-05-09 16:23:42 +02:00
committed by intellij-monorepo-bot
parent d48fc062af
commit 68bbb35628
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/changesHandler/CommonInjectedFileChangesHandler.kt
View File

@@ -315,6 +315,7 @@ data class MarkersMapping(val hostMarker: RangeMarker,
infix fun TextRange?.union(another: TextRange?) = another?.let { this?.union(it) ?: it } ?: this
inline val Segment.range: TextRange get() = TextRange.create(this)
inline val RangeMarker.range: TextRange get() = this.textRange
inline val PsiLanguageInjectionHost.Shred.innerRange: TextRange
get() = TextRange.create(this.range.startOffset + this.prefix.length,

2
platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsDataModel.kt
View File

@@ -184,7 +184,7 @@ internal class RecentLocationsDataModel(val project: Project,
return if (startOffset <= endOffset)
TextRange.create(startOffset, endOffset)
else
TextRange.create(DocumentUtil.getLineTextRange(document, line))
DocumentUtil.getLineTextRange(document, line)
}
}

20
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/RangeMarkerTest.java
View File

@@ -393,7 +393,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
WriteAction.run(() -> {
synchronizer.startTransaction(getProject(), document, psiFile);
String newText = StringUtil.replaceSubstring(document.getText(), TextRange.create(marker), "");
String newText = StringUtil.replaceSubstring(document.getText(), marker.getTextRange(), "");
synchronizer.replaceString(document, 0, document.getTextLength(), newText);
final List<DocumentEvent> events = new ArrayList<>();
@@ -887,7 +887,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
int x = gen.nextInt(N);
int y = x + gen.nextInt(N - x);
RangeMarkerEx r = (RangeMarkerEx)finalDocument.createRangeMarker(x, y);
adds.add(Pair.create(r, TextRange.create(r)));
adds.add(Pair.create(r, r.getTextRange()));
}
for (int i = 0; i < 10; i++) {
@@ -1438,9 +1438,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
WriteCommandAction.runWriteCommandAction(getProject(), ()->document.insertString(2,"000"));
assertTrue(marker[0].isValid());
assertEquals("bl000ah", TextRange.create(marker[0]).substring(document.getText()));
assertEquals("bl000ah", marker[0].getTextRange().substring(document.getText()));
assertTrue(persistentMarker[0].isValid());
assertEquals("bl000ah", TextRange.create(persistentMarker[0]).substring(document.getText()));
assertEquals("bl000ah", persistentMarker[0].getTextRange().substring(document.getText()));
gcDocument();
checkRMTreesAreGCedWhenNoReachableRangeMarkersLeft(vf, marker, persistentMarker);
}
@@ -1490,9 +1490,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
assertEquals(newText, document.getText());
assertTrue(marker[0].isValid());
assertEquals("la", TextRange.create(marker[0]).substring(document.getText()));
assertEquals("la", marker[0].getTextRange().substring(document.getText()));
assertTrue(persistentMarker[0].isValid());
assertEquals("la", TextRange.create(persistentMarker[0]).substring(document.getText()));
assertEquals("la", persistentMarker[0].getTextRange().substring(document.getText()));
gcDocument();
checkRMTreesAreGCedWhenNoReachableRangeMarkersLeft(vf, marker, persistentMarker);
}
@@ -1570,9 +1570,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
RangeMarker[] marker = {createMarker(psiFile, 1, 3)};
RangeMarker[] persistentMarker = {document.createRangeMarker(1, 3, true)};
assertTrue(marker[0].isValid());
assertEquals("la", TextRange.create(marker[0]).substring(document.getText()));
assertEquals("la", marker[0].getTextRange().substring(document.getText()));
assertTrue(persistentMarker[0].isValid());
assertEquals("la", TextRange.create(persistentMarker[0]).substring(document.getText()));
assertEquals("la", persistentMarker[0].getTextRange().substring(document.getText()));
int docHash1 = System.identityHashCode(document);
assertNotSame(docHash0, docHash1);
assertTrue(oldmarker[0].isValid());
@@ -1592,9 +1592,9 @@ public class RangeMarkerTest extends LightPlatformTestCase {
WriteCommandAction.runWriteCommandAction(getProject(), ()->document.insertString(2,"000"));
assertTrue(marker[0].isValid());
assertEquals("l000a", TextRange.create(marker[0]).substring(document.getText()));
assertEquals("l000a", marker[0].getTextRange().substring(document.getText()));
assertTrue(persistentMarker[0].isValid());
assertEquals("l000a", TextRange.create(persistentMarker[0]).substring(document.getText()));
assertEquals("l000a", persistentMarker[0].getTextRange().substring(document.getText()));
assertTrue(oldmarker[0].isValid());
oldmarker[0] = null;
gcDocument();

2
xml/dom-impl/src/com/intellij/util/xml/ui/DomUIFactoryImpl.java
View File

@@ -60,7 +60,7 @@ public class DomUIFactoryImpl extends DomUIFactory {
}
@Override
public final UserActivityWatcher createEditorAwareUserActivityWatcher() {
public final @NotNull UserActivityWatcher createEditorAwareUserActivityWatcher() {
return new UserActivityWatcher() {
private final DocumentListener myListener = new DocumentListener() {
@Override

1
xml/dom-openapi/src/com/intellij/util/xml/ui/DomUIFactory.java
View File

@@ -86,6 +86,7 @@ public abstract class DomUIFactory {
protected abstract TableCellEditor createCellEditor(DomElement element, Class type);
@NotNull
public abstract UserActivityWatcher createEditorAwareUserActivityWatcher();
public abstract void setupErrorOutdatingUserActivityWatcher(CommittablePanel panel, DomElement... elements);