Commit 79c91bc9 authored by Christoph Cullmann's avatar Christoph Cullmann

merge master => frameworks

parents 98453386 3a3cde5d
# general
build
*.rej
*.orig
*.out
# kate
.kateproject.d
......@@ -8,3 +11,9 @@ build
# kdevelop
*.kdev4
# from kdiff3
*.BACKUP.*
*.BASE.*
*.LOCAL.*
*.REMOTE.*
......@@ -56,7 +56,7 @@ Name[sv]=Filsystembläddrare
Name[tg]=Браузери системаи файлҳо
Name[tr]=Dosya sistemi tarayıcı
Name[ug]=ھۆججەت سىستېما كۆرگۈ
Name[uk]=Навігатор файлової системи
Name[uk]=Навігатор файловою системою
Name[wa]=Naivieu d' sistinme di fitchî
Name[x-test]=xxFile system browserxx
Name[zh_CN]=文件系统浏览器
......
......@@ -27,7 +27,7 @@ set(sources engine.cpp plugin.cpp utilities.cpp )
# (at least version 3.3 of it has a member PyType_Spec::slots)
add_definitions(-DQT_NO_KEYWORDS)
kde4_add_ui_files(sources info.ui manager.ui)
kde4_add_ui_files(sources manager.ui)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
......
This diff is collapsed.
......@@ -33,6 +33,7 @@ from PyQt4.QtCore import QEvent, QObject, QUrl, Qt, pyqtSlot
from PyQt4.QtGui import (
QBrush
, QColor
, QPalette
, QSplitter
, QTabWidget
, QTextBrowser
......@@ -42,7 +43,7 @@ from PyQt4.QtGui import (
)
from PyKDE4.kdecore import i18nc, KUrl
from PyKDE4.kdeui import KIcon
from PyKDE4.kdeui import KIcon, KColorScheme
from PyKDE4.kio import KFile, KFileDialog, KUrlRequesterDialog
from PyKDE4.ktexteditor import KTextEditor
......@@ -627,13 +628,14 @@ class CMakeToolView(QObject):
, cmake_help_parser.help_category.HELP_ITEM
)
global _cmake_completion_model
schema = KColorScheme(QPalette.Normal, KColorScheme.Selection)
if _cmake_completion_model.has_completion_for_command(cmd):
c.setForeground(0, QBrush(QColor(Qt.green)))
c.setForeground(0, schema.foreground(KColorScheme.PositiveText).color())
else:
if cmd in deprecated:
c.setForeground(0, QBrush(QColor(Qt.yellow)))
c.setForeground(0, schema.foreground(KColorScheme.NeutralText).color())
else:
c.setForeground(0, QBrush(QColor(Qt.red)))
c.setForeground(0, schema.foreground(KColorScheme.NegativeText).color())
# Add modules group
standard_modules = cmake_help_parser.get_cmake_modules_list()
......
......@@ -18,8 +18,10 @@ Name[sr@ijekavian]=Прикључак за Гнуове ИД алатке
Name[sr@ijekavianlatin]=Priključak za GNU‑ove ID alatke
Name[sr@latin]=Priključak za GNU‑ove ID alatke
Name[sv]=GNU idutils-insticksprogram
Name[tr]=GNU idutils eklentisi
Name[uk]=Додаток GNU idutils
Name[x-test]=xxGNU idutils pluginxx
Name[zh_TW]=GNU idutils 外掛程式
Comment=Browse the tokens in a GNU idutils ID file
Comment[de]=Durchsuchen Sie die Token in einer ID-Datei von „GNU-Idutils“
Comment[gl]=Examina os tokens dun ficheiro de identificadores de GNU idutils
......@@ -35,6 +37,8 @@ Comment[sr@ijekavian]=Прегледајте токене у фајлу Гнуо
Comment[sr@ijekavianlatin]=Pregledajte tokene u fajlu GNU‑ovih ID alatki
Comment[sr@latin]=Pregledajte tokene u fajlu GNU‑ovih ID alatki
Comment[sv]=Bläddra bland symbolerna i en GNU idutils id-fil
Comment[tr]=Bir GNU idutils kimlik dosyasına belirteçlere göz atın
Comment[uk]=Перегляд ключів у файлі ідентифікаторів GNU idutils
Comment[x-test]=xxBrowse the tokens in a GNU idutils ID filexx
Comment[zh_TW]=瀏覽 GNU idutils ID 檔裡的標記
X-Python-2-Compatible=true
......@@ -38,7 +38,9 @@ Comment[sr@ijekavian]=Над библиотеком Џедај
Comment[sr@ijekavianlatin]=Nad bibliotekom Jedi
Comment[sr@latin]=Nad bibliotekom Jedi
Comment[sv]=Baserat på Jedi-biblioteket
Comment[tr]=Jedi kütüphanesine dayanmaktadır
Comment[uk]=Засновано на бібліотеці Jedi
Comment[x-test]=xxBased on the Jedi libraryxx
Comment[zh_TW]=基於 Jedi 函式庫
X-Python-2-Compatible=true
X-Python-Dependencies=jedi(>=0.7.0)
......@@ -16,8 +16,10 @@ Name[sr@ijekavian]=Лако отварање и стварање фајлова
Name[sr@ijekavianlatin]=Lako otvaranje i stvaranje fajlova
Name[sr@latin]=Lako otvaranje i stvaranje fajlova
Name[sv]=Öppna/skapa fil enkelt
Name[tr]=Kolay dosya açma/oluşturma
Name[uk]=Просте відкриття та створення файлів
Name[x-test]=xxEasy file open/createxx
Name[zh_TW]=簡單檔案開啟/建立
Comment=Try to open selected text as URI to a document
Comment[de]=Öffnen des ausgewählten Textes als URI zu einem Dokument
Comment[gl]=Tenta abrir o texto escollido como se fose a URI dun documento
......@@ -32,5 +34,7 @@ Comment[sr@ijekavian]=Отворите изабрани текст као УРИ
Comment[sr@ijekavianlatin]=Otvorite izabrani tekst kao URI dokumenta
Comment[sr@latin]=Otvorite izabrani tekst kao URI dokumenta
Comment[sv]=Försök öppna markerad text som en dokumentwebbadress
Comment[tr]=Seçilen metni bir belgeye adres olarak açmaya çalış
Comment[uk]=Відкриття позначеного тексту як адреси документа
Comment[x-test]=xxTry to open selected text as URI to a documentxx
Comment[zh_TW]=試著將選取的文字做為網址來開啟
......@@ -18,8 +18,10 @@ Name[sr@ijekavian]=ИксМЛ алатке
Name[sr@ijekavianlatin]=XML alatke
Name[sr@latin]=XML alatke
Name[sv]=XML-verktyg
Name[tr]=XML Araçları
Name[uk]=Засоби XML
Name[x-test]=xxXML Toolsxx
Name[zh_TW]=XML 工具
Comment=XML Pretty print
Comment[de]=XML-Quelltextformatierung
Comment[gl]=Versión para ler XML
......@@ -35,6 +37,8 @@ Comment[sr@ijekavian]=Улепшан испис ИксМЛ‑а
Comment[sr@ijekavianlatin]=Ulepšan ispis XML‑a
Comment[sr@latin]=Ulepšan ispis XML‑a
Comment[sv]=XML snygg utskrift
Comment[tr]=XML Güzel yazdırma
Comment[uk]=Форматування XML
Comment[x-test]=xxXML Pretty printxx
Comment[zh_TW]=XML 美觀列印
X-Python-2-Compatible=true
......@@ -18,8 +18,10 @@ Name[sr@ijekavian]=Питонске алатке
Name[sr@ijekavianlatin]=Python alatke
Name[sr@latin]=Python alatke
Name[sv]=Python-verktyg
Name[tr]=Python Yardımcı Programları
Name[uk]=Інструменти Python
Name[x-test]=xxPython Utilitiesxx
Name[zh_TW]=Python 工具
Comment=Parse Checker, PEP8 Checker, Pyflakes Checker, Snippets
Comment[de]=Python-Werkzeuge: Parse-Überprüfung, PEP8-Überprüfung, Pyflakes-Überprüfung, Textbausteine
Comment[gl]=Análise sintáctica, comprobacións PEP8, Pyflakes e Snippets
......@@ -35,7 +37,9 @@ Comment[sr@ijekavian]=Оверивач рашчлањивања, оверива
Comment[sr@ijekavianlatin]=Overivač raščlanjivanja, overivač PEP‑a 8, overivač PyFlakesa, isečci
Comment[sr@latin]=Overivač raščlanjivanja, overivač PEP‑a 8, overivač PyFlakesa, isečci
Comment[sv]=Tolkningskontroll, PEP8-kontroll, Pyflakes-kontroll, snuttar
Comment[tr]=Ayıklama Denetleyici, PEP8 Denetleyici, Pyflakes Denetleyici, Kod Parçacıkları
Comment[uk]=Перевірка обробки, перевірка PEP8, перевірка Pyflakes, фрагменти
Comment[x-test]=xxParse Checker, PEP8 Checker, Pyflakes Checker, Snippetsxx
Comment[zh_TW]=剖析檢查器,PEP8 檢查器,Pyflakes 檢查器,片段
X-Python-2-Compatible=true
X-Python-Dependencies=pep8(>=1.4.2),pyflakes(>=0.7.3)
......@@ -11,7 +11,7 @@ Name[ca]=Connector de projecte
Name[ca@valencia]=Connector de projecte
Name[cs]=Modul projektu
Name[da]=Projekt-plugin
Name[de]=Projektmodule
Name[de]=Projektmodul
Name[el]=Project πρόσθετο
Name[es]=Complemento de proyecto
Name[et]=Projektiplugin
......@@ -56,7 +56,7 @@ Comment[ca]=Connector de projecte pel Kate
Comment[ca@valencia]=Connector de projecte pel Kate
Comment[cs]=Modul projektů pro Kate
Comment[da]=Projekt-plugin til Kate
Comment[de]=Projektmodule für Kate
Comment[de]=Projektmodul für Kate
Comment[el]=Project πρόσθετο για το Kate
Comment[es]=Complemento de proyectos para Kate
Comment[et]=Kate projektiplugin
......
......@@ -66,9 +66,6 @@ whitespace at the end of lines.</para></listitem>
</guilabel></term>
<listitem><para>
<variablelist>
<!--FIXME missing
Enable power user mode (KDE 3 mode)
-->
<varlistentry>
<term><guilabel>Show indentation lines
</guilabel></term>
......
......@@ -3,8 +3,6 @@
"dtd/kdex.dtd" [
<!ENTITY kappname "&kate;">
<!ENTITY package "kdesdk">
<!ENTITY copy-this-msg "&nbsp;">
<!ENTITY i18n-powermode "&copy-this-msg;">
<!ENTITY imgpath "./">
<!ENTITY rcfile "katerc">
<!ENTITY gdb "<acronym>GDB</acronym>">
......
......@@ -1708,10 +1708,8 @@ Editor...</guimenuitem></menuchoice></para></listitem>
<guimenuitem>Create Snippet</guimenuitem>
</menuchoice></term>
<listitem>
<para>Create a new snippet, which is a resuable chunk of text you
<para>Create a new snippet, which is a reusable chunk of text you
may insert in any part of any document.</para>
<para>This menu item is displayed by the Snippets plugin, which is enabled by
default.</para>
</listitem>
</varlistentry>
......@@ -1722,8 +1720,6 @@ default.</para>
</menuchoice></term>
<listitem>
<para>Display a list of available snippets.</para>
<para>This menu item is displayed by the Snippets plugin, which is enabled by
default.</para>
</listitem>
</varlistentry>
......
......@@ -64,7 +64,7 @@ Numbers</guimenuitem></menuchoice> menu item.</para>
</varlistentry>
<varlistentry>
<term>The Folding Pane &i18n-powermode;</term>
<term>The Folding Pane</term>
<listitem>
<para>The folding pane allows you to collapse or expand foldable blocks
of lines. The calculation of the foldable regions is done according to
......@@ -184,7 +184,7 @@ action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>), or click
with the &LMB; in the editor.</para>
<sect2 id="kate-part-selection-block">
<title>Using Block Selection &i18n-powermode;</title>
<title>Using Block Selection</title>
<para>When Block Selection is enabled, you can make <quote>vertical
selections</quote> in the text, meaning selecting limited columns from
......@@ -449,7 +449,7 @@ on those.</para>
</sect1>
<sect1 id="kate-part-bookmarks">
<title>Using Bookmarks &i18n-powermode;</title>
<title>Using Bookmarks</title>
<para>The bookmarks feature allows you to mark certain lines, to be
able to easily find them again.</para>
......@@ -520,7 +520,7 @@ the feature on a per document level. This will be fixed in a future version of &
</sect1>
<sect1 id="kate-part-autoindent">
<title>Using automatic indenting &i18n-powermode;</title>
<title>Using automatic indenting</title>
<para>&kappname;s editor component supports a variety of autoindenting modes,
designed for different text formats. You can pick from the available modes using
......
......@@ -39,7 +39,6 @@ as HTML</guimenuitem></menuchoice>. Additionally you can use <menuchoice><guimen
as HTML to the system clipboard.</para></listitem>
</varlistentry>
<!--FIXME not in master, but in 4.10 ??-->
<varlistentry>
<term><guilabel>Highlight Selection</guilabel></term>
<!--http://kate-editor.org/2010/11/14/highlight-selected-text/-->
......
......@@ -3,7 +3,6 @@
"dtd/kdex.dtd" [
<!ENTITY kappname "&kwrite;">
<!ENTITY package "kdebase">
<!ENTITY i18n-powermode "(power user mode)">
<!ENTITY imgpath "../kate/">
<!ENTITY rcfile "kwriterc">
<!ENTITY fundamentals-chapter SYSTEM "fundamentals.docbook">
......@@ -54,8 +53,8 @@
</copyright>
<legalnotice>&FDLNotice;</legalnotice>
<date>2013-07-03</date>
<releaseinfo>4.11 (&kde; 4.11)</releaseinfo>
<date>2013-11-28</date>
<releaseinfo>4.12 (&kde; 4.12)</releaseinfo>
<abstract>
<para>&kwrite; is a text editor for &kde; allowing you to edit one file at the time per window.</para>
......@@ -86,14 +85,6 @@ Bash, Modula 2, &HTML;, and Ada.
<para>&kwrite; has a single document interface (<acronym>SDI</acronym>)
allowing you to edit one file at the time per window.
</para>
<para>
&kwrite; features two different modes, a simple mode with a straightforward interface
and an advanced mode with more features and more extensive menu items.
The advanced mode is enabled by checking the option <link linkend="appearance">
Enable power user mode (&kde; 3 mode)</link>
on the <guilabel>Appearance</guilabel> page in &kappname;s
settings.
</para>
</chapter>
&fundamentals-chapter;
......
This diff is collapsed.
......@@ -80,7 +80,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
KAboutData aboutData ("kate", 0, ki18n("Kate"), kateVersion,
ki18n( "Kate - Advanced Text Editor" ), KAboutData::License_LGPL_V2,
ki18n( "(c) 2000-2005 The Kate Authors" ), KLocalizedString(), "http://www.kate-editor.org");
ki18n( "(c) 2000-2013 The Kate Authors" ), KLocalizedString(), "http://www.kate-editor.org");
aboutData.setOrganizationDomain("kde.org");
aboutData.addAuthor (ki18n("Christoph Cullmann"), ki18n("Maintainer"), "cullmann@kde.org", "http://www.cullmann.io");
aboutData.addAuthor (ki18n("Anders Lund"), ki18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk");
......
......@@ -652,7 +652,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
i18n("KWrite"),
KDE_VERSION_STRING,
i18n( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
i18n( "(c) 2000-2010 The Kate Authors" ), QString(), QString ("http://www.kate-editor.org") );
i18n( "(c) 2000-2013 The Kate Authors" ), QString(), QString ("http://www.kate-editor.org") );
aboutData.addAuthor (i18n("Christoph Cullmann"), i18n("Maintainer"), "cullmann@kde.org", "http://www.cullmann.io");
aboutData.addAuthor (i18n("Anders Lund"), i18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk");
aboutData.addAuthor (i18n("Joseph Wenninger"), i18n("Core Developer"), "jowenn@kde.org","http://stud3.tuwien.ac.at/~e9925371");
......
......@@ -162,7 +162,23 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="cmbShowScrollbars"/>
<widget class="QComboBox" name="cmbShowScrollbars">
<item>
<property name="text">
<string>Always On</string>
</property>
</item>
<item>
<property name="text">
<string>Show When Needed</string>
</property>
</item>
<item>
<property name="text">
<string>Always Off</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
......
......@@ -779,10 +779,6 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(QWidget *parent)
textareaUi->cmbDynamicWordWrapIndicator->addItem( i18n("Follow Line Numbers") );
textareaUi->cmbDynamicWordWrapIndicator->addItem( i18n("Always On") );
bordersUi->cmbShowScrollbars->addItem( i18n("When needed") );
bordersUi->cmbShowScrollbars->addItem( i18n("Always on") );
bordersUi->cmbShowScrollbars->addItem( i18n("Always off") );
// hide power user mode if activated anyway
if (!KateGlobal::self()->simpleMode ())
textareaUi->chkDeveloperMode->hide ();
......
This diff is collapsed.
......@@ -442,12 +442,13 @@ class KATEPART_TESTS_EXPORT KateViewConfig : public KateConfig
int scrollBarMiniMapWidth () const;
void setScrollBarMiniMapWidth (int width);
/**
* Whether to show scrollbars
* 0: When needed
* 1: Always on
* 2: Always off
*/
/* Whether to show scrollbars */
enum ScrollbarMode {
AlwaysOn = 0,
ShowWhenNeeded,
AlwaysOff
};
int showScrollbars () const;
void setShowScrollbars (int mode);
......
......@@ -69,7 +69,7 @@ KateGlobal::KateGlobal ()
: KTextEditor::Editor (0)
, m_aboutData (QString ("katepart"), QString(), i18n("Kate Part"), katePartVersion(),
i18n( "Embeddable editor component" ), KAboutData::License_LGPL_V2,
i18n( "(c) 2000-2009 The Kate Authors" ), QString(), QString ("http://www.kate-editor.org"))
i18n( "(c) 2000-2013 The Kate Authors" ), QString(), QString ("http://www.kate-editor.org"))
, m_snippetGlobal (0) // lazy constructed
, m_sessionConfig (KGlobal::config())
{
......
......@@ -573,10 +573,12 @@ void KateViewInternal::doUpdateView(bool changed, int viewLinesScrolled)
m_lineScroll->setPageStep(qMax (0, height()) / renderer()->lineHeight());
m_lineScroll->blockSignals(blocked);
const int show_scrollbars = view()->config()->showScrollbars();
KateViewConfig::ScrollbarMode show_scrollbars = static_cast<KateViewConfig::ScrollbarMode>(view()->config()->showScrollbars());
bool visible = show_scrollbars == 1 || (show_scrollbars == 0 && maxLineScrollRange != 0);
bool visible = ( (show_scrollbars == KateViewConfig::AlwaysOn) ||
((show_scrollbars == KateViewConfig::ShowWhenNeeded) && (maxLineScrollRange != 0)) );
bool visible_dummy = visible;
m_lineScroll->setVisible( visible );
if (!m_view->dynWordWrap())
......@@ -596,7 +598,8 @@ void KateViewInternal::doUpdateView(bool changed, int viewLinesScrolled)
// disable scrollbar
m_columnScroll->setDisabled (max == 0);
visible = show_scrollbars == 1 || (show_scrollbars == 0 && max != 0);
visible = ( (show_scrollbars == KateViewConfig::AlwaysOn) ||
((show_scrollbars == KateViewConfig::ShowWhenNeeded) && (max != 0)) );
visible_dummy &= visible;
m_columnScroll->setVisible( visible );
......
......@@ -56,6 +56,7 @@ KateViInputModeManager::KateViInputModeManager(KateView* view, KateViewInternal*
m_viReplaceMode = new KateViReplaceMode(this, view, viewInternal);
m_currentViMode = NormalMode;
m_previousViMode = NormalMode;
m_view = view;
m_viewInternal = viewInternal;
......@@ -440,6 +441,7 @@ void KateViInputModeManager::setLastSearchPattern( const QString &p )
void KateViInputModeManager::changeViMode(ViMode newMode)
{
m_previousViMode = m_currentViMode;
m_currentViMode = newMode;
}
......@@ -448,6 +450,11 @@ ViMode KateViInputModeManager::getCurrentViMode() const
return m_currentViMode;
}
ViMode KateViInputModeManager::getPreviousViMode() const
{
return m_previousViMode;
}
bool KateViInputModeManager::isAnyVisualMode() const
{
return ((m_currentViMode == VisualMode) || (m_currentViMode == VisualLineMode) || (m_currentViMode == VisualBlockMode));
......
......@@ -95,6 +95,11 @@ public:
*/
ViMode getCurrentViMode() const;
/**
* @return the previous vi mode
*/
ViMode getPreviousViMode() const;
/**
* @return true if and only if the current mode is one of VisualMode, VisualBlockMode or VisualLineMode.
*/
......@@ -287,6 +292,7 @@ private:
KateViReplaceMode* m_viReplaceMode;
ViMode m_currentViMode;
ViMode m_previousViMode;
KateView *m_view;
KateViewInternal *m_viewInternal;
......
......@@ -1225,6 +1225,8 @@ bool KateViNormalMode::commandChangeLine()
bool KateViNormalMode::commandSubstituteChar()
{
if ( commandDeleteChar() ) {
// The count is only used for deletion of chars; the inserted text is not repeated
setCount(0);
return commandEnterInsertMode();
}
......@@ -1865,6 +1867,18 @@ bool KateViNormalMode::commandReplayMacro()
return true;
}
bool KateViNormalMode::commandCloseNocheck()
{
m_view->cmdLineBar()->execute("q!");
return true;
}
bool KateViNormalMode::commandCloseWrite()
{
m_view->cmdLineBar()->execute("wq");
return true;
}
bool KateViNormalMode::commandCollapseLocal()
{
#if 0
......@@ -3419,6 +3433,9 @@ void KateViNormalMode::initializeCommands()
ADDCMD("q.", commandStartRecordingMacro, REGEX_PATTERN);
ADDCMD("@.", commandReplayMacro, REGEX_PATTERN);
ADDCMD("ZZ", commandCloseWrite, 0);
ADDCMD("ZQ", commandCloseNocheck, 0);
// regular motions
ADDMOTION("h", motionLeft, 0 );
ADDMOTION("<left>", motionLeft, 0 );
......
......@@ -173,6 +173,9 @@ class KATEPART_TESTS_EXPORT KateViNormalMode : public KateViModeBase
bool commandStartRecordingMacro();
bool commandReplayMacro();
bool commandCloseWrite();
bool commandCloseNocheck();
// MOTIONS
KateViRange motionLeft();
......
......@@ -168,7 +168,10 @@ void KateViVisualMode::reset()
}
}
startNormalMode();
if (m_viInputModeManager->getPreviousViMode() == InsertMode)
startInsertMode();
else
startNormalMode();
}
if (!m_commandShouldKeepSelection)
......
v.setCursorPosition(0,2);
v.type("+");
v.type("=");
v.type("ok;");
v.setCursorPosition(1,2);
v.type("+");
v.type("=");
v.type("ok;");
......@@ -95,12 +95,12 @@ void IndentTest::initTestCase()
}
void IndentTest::cstyle_data()
void IndentTest::testCstyle_data()
{
getTestData( "cstyle" );
}
void IndentTest::cstyle()
void IndentTest::testCstyle()
{
runTest( ExpectedFailures() << FAILURE( "using1", "this is insane, those who write such code can cope with it :P" )
<< FAILURE( "using2", "this is insane, those who write such code can cope with it :P" )
......@@ -116,12 +116,12 @@ void IndentTest::cstyle()
}
void IndentTest::cppstyle_data()
void IndentTest::testCppstyle_data()
{
getTestData( "cppstyle" );
}
void IndentTest::cppstyle()
void IndentTest::testCppstyle()
{
runTest(
ExpectedFailures()
......@@ -131,23 +131,23 @@ void IndentTest::cppstyle()
}
void IndentTest::python_data()
void IndentTest::testPython_data()
{
getTestData( "python" );
}
void IndentTest::python()
void IndentTest::testPython()
{
runTest( ExpectedFailures() );
}
void IndentTest::haskell_data()
void IndentTest::testHaskell_data()
{
getTestData( "haskell" );
}
void IndentTest::haskell()
void IndentTest::testHaskell()
{
runTest( ExpectedFailures() );
}
......@@ -164,23 +164,23 @@ void IndentTest::latex()
}
void IndentTest::pascal_data()
void IndentTest::testPascal_data()
{
getTestData( "pascal" );
}
void IndentTest::pascal()
void IndentTest::testPascal()
{
runTest( ExpectedFailures() );
}
void IndentTest::ruby_data()
void IndentTest::testRuby_data()
{
getTestData( "ruby" );
}
void IndentTest::ruby()
void IndentTest::testRuby()
{
runTest( ExpectedFailures() << FAILURE( "block01", "Multiline blocks using {} is not supported" )
<< FAILURE( "block02", "Multiline blocks using {} is not supported" )
......@@ -200,23 +200,23 @@ void IndentTest::ruby()
}
void IndentTest::xml_data()
void IndentTest::testXml_data()
{
getTestData( "xml" );
}
void IndentTest::xml()
void IndentTest::testXml()
{
runTest( ExpectedFailures() );
}
void IndentTest::normal_data()
void IndentTest::testNormal_data()
{
getTestData( "normal" );
}
void IndentTest::normal()
void IndentTest::testNormal()
{
runTest( ExpectedFailures() << FAILURE( "emptyline1", "is that really what we expect?" )
<< FAILURE( "emptyline3", "is that really what we expext?" )
......
......@@ -27,32 +27,32 @@ class IndentTest : public ScriptTestBase
private slots:
void initTestCase();
void python_data();
void python();
void testPython_data();
void testPython();
void cstyle_data();
void cstyle();
void testCstyle_data();
void testCstyle();
void cppstyle_data();
void cppstyle();
void testCppstyle_data();
void testCppstyle();
void ruby_data();
void ruby();
void testRuby_data();
void testRuby();
void haskell_data();
void haskell();
void testHaskell_data();
void testHaskell();
void latex_data();
void latex();
void pascal_data();
void pascal();
void testPascal_data();
void testPascal();
void xml_data();
void xml();
void testXml_data();
void testXml();
void normal_data();
void normal();
void testNormal_data();
void testNormal();
};
#endif // INDENTTEST_H
......@@ -167,7 +167,9 @@ void ScriptTestBase::runTest(const ExpectedFailures& failures)
// evaluate test-script
QFile sourceFile(testcase + "/input.js");
QVERIFY( sourceFile.open(QFile::ReadOnly) );
if ( !sourceFile.open(QFile::ReadOnly) ) {
QFAIL(qPrintable(QString("Failed to open file: %1").arg(sourceFile.fileName())));
}
QTextStream stream(&sourceFile);
stream.setCodec("UTF8");
......
......@@ -733,6 +733,19 @@ void ViModeTest::VisualModeTests() {
// Regression