cleanup

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java
index ed9c81274c3bc86060a67bb4105f4472e8e0b16c..499859b16ea32212b4733c2647173aa020d9ed99 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java
@@ -94,7 +94,7 @@ public class SaveAsTemplateAction extends AnAction {
                   String canonicalText = reference.getCanonicalText();
                   TextRange referenceRange = reference.getRangeInElement();
                   TextRange range = element.getTextRange().cutOut(referenceRange).shiftRight(-offsetDelta);
-                  final String oldText = range.substring(document.getText());
+                  final String oldText = document.getText(range);
                   if (!canonicalText.equals(oldText)) {
                     rangeToText.put(document.createRangeMarker(range), canonicalText);
                   }

diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index db2ab7263ce0c92bb74aa4c871b9825a307b3886..27194385b00369f824b48cd153257c2b38892a48 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -354,7 +354,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
                                     HighlighterTargetArea.EXACT_RANGE);
 
     final int offset = history.getTextLength();
-    final String text = textRange.substring(consoleEditor.getDocument().getText());
+    final String text = consoleEditor.getDocument().getText(textRange);
     history.insertString(offset, text);
     final HighlighterIterator iterator = consoleEditor.getHighlighter().createIterator(0);
     while (!iterator.atEnd()) {

diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
index 3e2d33fb73098f5fbe25f35104c9076e7504506f..22994aeced58bf980bf843d9bb20fa4365e13639 100644 (file)
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/NameSuggestionsField.java
@@ -93,7 +93,7 @@ public class NameSuggestionsField extends JPanel {
         Editor myEditor = getEditor();
         if (myEditor == null) return;
         for (TextRange wordRange : ranges) {
-          String word = wordRange.substring(editor.getDocument().getText());
+          String word = editor.getDocument().getText(wordRange);
           if (!word.equals(getEnteredName())) continue;
           final SelectionModel selectionModel = editor.getSelectionModel();
           myEditor.getSelectionModel().removeSelection();

diff --git a/platform/platform-api/src/com/intellij/openapi/editor/Document.java b/platform/platform-api/src/com/intellij/openapi/editor/Document.java
index f91381b6378973a49a3582dc3213fc65d98652bc..40d816a61151f69fea682155a90b3c2e587cb69c 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/editor/Document.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/Document.java
@@ -49,7 +49,7 @@ public interface Document extends UserDataHolder {
    */
   String getText();
 
-  String getText(TextRange range);
+  @NotNull String getText(@NotNull TextRange range);
 
   /**
    * Use this method instead of {@link #getText()} if you do not need to create a copy of the content.

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeOperations.java b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeOperations.java
index bf5b3f869d241ef8607be0c60be2cd81077847c2..686c6dcc258b79f02d13441ee4034871858a1b73 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeOperations.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeOperations.java
@@ -143,7 +143,7 @@ public class MergeOperations {
   }
 
   private static String getSubstring(Document document, TextRange range) {
-    return range.substring(document.getText());
+    return document.getText(range);
   }
 
   private Document getOtherDocument() {

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentDocument.java b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentDocument.java
index 5dd8a221ba081e023113eb874bd7537417105e1d..e00328aa34c99167cd9d8ea78d9017ec4ca719c6 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentDocument.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentDocument.java
@@ -50,8 +50,9 @@ public class TextComponentDocument extends UserDataHolderBase implements Documen
     }
   }
 
+  @NotNull
   @Override
-  public String getText(TextRange range) {
+  public String getText(@NotNull TextRange range) {
     try {
       final javax.swing.text.Document document = myTextComponent.getDocument();
       return document.getText(range.getStartOffset(), range.getLength());

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XAddToWatchesFromEditorActionHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XAddToWatchesFromEditorActionHandler.java
index f154bae4e615e72529462bd1f4290b19a277b71d..30cc57f2d08d2c9ee0b86adfd4fac41b7ed3dcd4 100644 (file)
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XAddToWatchesFromEditorActionHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XAddToWatchesFromEditorActionHandler.java
@@ -54,7 +54,7 @@ public class XAddToWatchesFromEditorActionHandler extends XDebuggerActionHandler
           final Document document = editor.getDocument();
           final TextRange textRange = evaluator.getExpressionRangeAtOffset(session.getProject(), document, offset);
           if (textRange != null) {
-            text = textRange.substring(document.getText());
+            text = document.getText(textRange);
           }
         }
       }

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
index 8797bde9ef4cc71eb082980d34b8faf934fd2c58..22a4c8d94756a8295ea3d9ed933861e5e0051cb0 100644 (file)
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
@@ -62,7 +62,7 @@ public class XValueHint extends AbstractValueHint {
     myEvaluator = evaluator;
     myDebugSession = session;
     final Document document = editor.getDocument();
-    myExpression = textRange.substring(document.getText());
+    myExpression = document.getText(textRange);
     final VirtualFile file = FileDocumentManager.getInstance().getFile(document);
     myExpressionPosition = file != null ? XDebuggerUtil.getInstance().createPositionByOffset(file, textRange.getStartOffset()) : null;
   }

diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java
index b25c14e7b7325a4675789e8232a2590e59ff4242..b3d672d21d56b27330527188e395745bc7105a44 100644 (file)
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java
@@ -197,7 +197,7 @@ public class I18nizeAction extends AnAction implements I18nQuickFixHandler{
 
     TextRange selectedRange = getSelectedRange(editor, psiFile);
     if (selectedRange == null) return null;
-    String text = selectedRange.substring(editor.getDocument().getText());
+    String text = editor.getDocument().getText(selectedRange);
     return new JavaI18nizeQuickFixDialog(project, jspFile, null, text, null, false, true){
       protected String getTemplateName() {
         return JavaTemplateUtil.TEMPLATE_I18NIZED_JSP_EXPRESSION;

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/BaseSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/BaseSplitter.java
index 795fe9f62648a63a4ff01c173dd7a42ae0133fc1..7737cb1a96afe95396bebdc571494f0bfb50f4b1 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/BaseSplitter.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/BaseSplitter.java
@@ -100,7 +100,7 @@ public abstract class BaseSplitter implements Splitter {
     int from = range.getStartOffset();
     int till;
     boolean addLast = true;
-    Matcher matcher = toExclude.matcher(text.substring(range.getStartOffset(), range.getEndOffset()));
+    Matcher matcher = toExclude.matcher(range.substring(text));
     while (matcher.find()) {
 
       checkCancelled();

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/CheckArea.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/CheckArea.java
index 1be5847a351a7ac55bbc333853e2004b883e2311..a8d1a35072f0039a96ef108fd0d27b7129f45b9b 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/CheckArea.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/CheckArea.java
@@ -48,7 +48,7 @@ public class CheckArea {
   @Nullable
   public String getWord() {
     if (text == null || textRange == null) return null;
-    return text.substring(textRange.getStartOffset(), textRange.getEndOffset());
+    return textRange.substring(text);
   }
 
   @Override

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
index ba04494aea4b7227c18740bedbb2e8758909d896..9435f63f05cbe4aa93a093cf04edade80c64a5b0 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PlainTextSplitter.java
@@ -38,7 +38,7 @@ public class PlainTextSplitter extends BaseSplitter {
     if (text == null || StringUtil.isEmpty(text)) {
       return null;
     }
-    if (Verifier.checkCharacterData(text.substring(range.getStartOffset(), range.getEndOffset())) != null) {
+    if (Verifier.checkCharacterData(range.substring(text)) != null) {
       return null;
     }
 

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java
index 1311891ce5dd8626eb35ac017a09309cd7f87db5..2a3dceb46645ad8fdf53ca0cac6e4d9842773d49 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java
@@ -40,7 +40,7 @@ public class PropertiesSplitter extends BaseSplitter {
     }
     List<CheckArea> results = new ArrayList<CheckArea>();
     final IdentifierSplitter splitter = SplitterFactory.getInstance().getIdentifierSplitter();
-    Matcher matcher = WORD.matcher(text.substring(range.getStartOffset(), range.getEndOffset()));
+    Matcher matcher = WORD.matcher(range.substring(text));
     while (matcher.find()) {
       if (matcher.end() - matcher.start() < MIN_RANGE_LENGTH) {
         continue;

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/TextSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/TextSplitter.java
index e68defbe000a004873a8e1e1f2711ca479ccba39..8c9ec865a3cdc0d258eacf35db92189603506e0c 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/TextSplitter.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/TextSplitter.java
@@ -41,7 +41,7 @@ public class TextSplitter extends BaseSplitter {
   protected void doSplit(@NotNull String text, @NotNull TextRange range, List<CheckArea> results) {
     Matcher matcher;
     final WordSplitter ws = SplitterFactory.getInstance().getWordSplitter();
-    matcher = EXTENDED_WORD_AND_SPECIAL.matcher(text.substring(range.getStartOffset(), range.getEndOffset()));
+    matcher = EXTENDED_WORD_AND_SPECIAL.matcher(range.substring(text));
     while (matcher.find()) {
       TextRange found = matcherRange(range, matcher);
 

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java
index aa3192f2f75e350fa30392562dc9c611c72363ad..057c29da6adb0fc42650496228113c823d184ba7 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java
@@ -39,7 +39,7 @@ public class WordSplitter extends BaseSplitter {
     }
     List<CheckArea> results = new ArrayList<CheckArea>();
 
-    Matcher specialMatcher = SPECIAL.matcher(text.substring(range.getStartOffset(), range.getEndOffset()));
+    Matcher specialMatcher = SPECIAL.matcher(range.substring(text));
     if (specialMatcher.find()) {
       TextRange found = matcherRange(range, specialMatcher);
       addWord(text, results, true, found);