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

fixed python debug console highlighting

Browse Source
This commit is contained in:
Dmitry Trofimov
2010-11-13 19:43:34 +03:00
parent 275404079e
commit a8f668baae
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+13 -6
View File
@@ -64,6 +64,7 @@ import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.FocusManager;
import javax.swing.*;
@@ -318,7 +319,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
final Document history = myHistoryViewer.getDocument();
final MarkupModel markupModel = history.getMarkupModel(myProject);
final int offset = history.getTextLength();
history.insertString(offset, text);
appendToHistoryDocument(history, text);
markupModel.addRangeHighlighter(offset,
history.getTextLength(),
HighlighterLayer.SYNTAX,
@@ -359,15 +360,15 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
private String addTextRangeToHistory(TextRange textRange, final EditorEx consoleEditor) {
final DocumentImpl history = (DocumentImpl)myHistoryViewer.getDocument();
final MarkupModel markupModel = history.getMarkupModel(myProject);
history.insertString(history.getTextLength(), myPrompt);
appendToHistoryDocument(history, myPrompt);
markupModel.addRangeHighlighter(history.getTextLength() - myPrompt.length(), history.getTextLength(), HighlighterLayer.SYNTAX,
ConsoleViewContentType.USER_INPUT.getAttributes(),
HighlighterTargetArea.EXACT_RANGE);
int offset = history.getTextLength();
final String text = consoleEditor.getDocument().getText(textRange);
history.insertString(offset, text);
offset = history.getTextLength() - text.length(); //offset can be changed after text trimming after insert due to buffer constraints
//offset can be changed after text trimming after insert due to buffer constraints
appendToHistoryDocument(history, text);
int offset = history.getTextLength() - text.length();
final HighlighterIterator iterator = consoleEditor.getHighlighter().createIterator(0);
while (!iterator.atEnd()) {
final int localOffset = textRange.getStartOffset();
@@ -382,10 +383,16 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
duplicateHighlighters(markupModel, consoleEditor.getDocument().getMarkupModel(myProject), offset, textRange);
duplicateHighlighters(markupModel, consoleEditor.getMarkupModel(), offset, textRange);
}
if (!text.endsWith("\n")) history.insertString(history.getTextLength(), "\n");
if (!text.endsWith("\n")) {
appendToHistoryDocument(history, "\n");
}
return text;
}
protected void appendToHistoryDocument(@NotNull Document history, @NotNull String text) {
history.insertString(history.getTextLength(), text);
}
private static void duplicateHighlighters(MarkupModel to, MarkupModel from, int offset, TextRange textRange) {
for (RangeHighlighter rangeHighlighter : from.getAllHighlighters()) {
final int localOffset = textRange.getStartOffset();
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+20 -11
View File
@@ -454,17 +454,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
myDeferredUserInput.append(s);
}
boolean needNew = true;
if (!myTokens.isEmpty()) {
final TokenInfo lastToken = myTokens.get(myTokens.size() - 1);
if (lastToken.contentType == contentType) {
lastToken.endOffset = myContentSize; // optimization
needNew = false;
}
}
if (needNew) {
myTokens.add(new TokenInfo(contentType, myContentSize - s.length(), myContentSize));
}
addToken(s.length(), contentType);
if (s.indexOf('\n') >= 0 || s.indexOf('\r') >= 0) {
if (contentType == ConsoleViewContentType.USER_INPUT) {
@@ -478,6 +468,25 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
}
}
protected void beforeExternalAddContentToDocument(int length, ConsoleViewContentType contentType) {
myContentSize+=length;
addToken(length, contentType);
}
private void addToken(int length, ConsoleViewContentType contentType) {
boolean needNew = true;
if (!myTokens.isEmpty()) {
final TokenInfo lastToken = myTokens.get(myTokens.size() - 1);
if (lastToken.contentType == contentType) {
lastToken.endOffset = myContentSize; // optimization
needNew = false;
}
}
if (needNew) {
myTokens.add(new TokenInfo(contentType, myContentSize - length, myContentSize));
}
}
private ModalityState getStateForUpdate() {
return myStateForUpdate != null ? myStateForUpdate.compute() : ModalityState.stateForComponent(this);
}