Development commit

Author: SergeySatskiy

ChangeLog

@@ -1,3 +1,10 @@
+2017 xxx xx Sergey Satskiy <sergey.satskiy@gmail.com>
+
+* Version 4.0.5
+* Proportional change of spacings when a mono font changed for the flow UI
+* New feature: show/hide comments/docstrings/except blocks on the flowUI
+* More flexible pyflakes suppression line
+
 2017 Dec 3 Sergey Satskiy <sergey.satskiy@gmail.com>
 
 * Verion 4.0.4

codimension/analysis/ierrors.py

@@ -19,6 +19,7 @@
 
 """Interactive errors report using pyflakes"""
 
+import re
 from _ast import PyCF_ONLY_AST
 from pyflakes.checker import Checker
 
@@ -28,6 +29,9 @@
 #  lineno2: [msg3, ...]}
 
 
+IGNORE_REGEXP = re.compile(r'analysis:\s*(off|disable|ignore)', re.IGNORECASE)
+
+
 def getBufferErrors(sourceCode):
     """Provides a list of warnings/errors for the given source code"""
     sourceCode += '\n'
@@ -60,7 +64,7 @@ def getBufferErrors(sourceCode):
         else:
             # By some reasons I see ast NAME node here (pyflakes 0.7.3)
             lineno = warning.lineno.lineno
-        if 'analysis:ignore' not in lines[lineno - 1]:
+        if not IGNORE_REGEXP.search(lines[lineno - 1]):
             if lineno in results:
                 results[lineno].append(warning.message % warning.message_args)
             else:

codimension/autocomplete/completelists.py

@@ -26,61 +26,9 @@
 import jedi
 from utils.globals import GlobalData
 from utils.fileutils import getFileContent
-from .listmodules import getSysModules, getModules
 from .bufferutils import getEditorTags
 
 
-__systemwideModules = {}
-__systemwideInitialized = False
-
-
-def buildSystemWideModulesList():
-    """Builds a map for the system wide modules"""
-    global __systemwideModules
-    global __systemwideInitialized
-
-    if not __systemwideInitialized:
-        __systemwideModules = getSysModules()
-        __systemwideInitialized = True
-
-
-def getSystemWideModules():
-    """Provides a list of system wide modules"""
-    buildSystemWideModulesList()
-    return __systemwideModules
-
-
-def getProjectSpecificModules(path='', onlySpecified=False):
-    """Provides a dictionary of the project specific modules"""
-    specificModules = {}
-    importDirs = []
-
-    if not onlySpecified:
-        importDirs = GlobalData().getProjectImportDirs()
-        for importPath in importDirs:
-            specificModules.update(getModules(importPath))
-
-        projectFile = GlobalData().project.fileName
-        if projectFile != "":
-            basedir = os.path.dirname(projectFile)
-            if basedir not in importDirs:
-                importDirs.append(basedir)
-                specificModules.update(getModules(basedir))
-
-    if path and os.path.isabs(path):
-        path = os.path.normpath(path)
-        basedir = ""
-        if os.path.isfile(path):
-            basedir = os.path.dirname(path)
-        elif os.path.isdir(path):
-            basedir = path
-
-        if basedir and basedir not in importDirs:
-            specificModules.update(getModules(basedir))
-
-    return specificModules
-
-
 def getCallSignatures(editor, fileName):
     """Provides a list of call signatures"""
     line, pos = editor.cursorPosition

codimension/autocomplete/listmodules.py

@@ -43,7 +43,6 @@
 from ui.qt import QTimer, QDir, QMessageBox
 from ui.application import CodimensionApplication
 from ui.splashscreen import SplashScreen
-from autocomplete.completelists import buildSystemWideModulesList
 from utils.project import CodimensionProject
 from utils.skin import Skin
 from utils.config import CONFIG_DIR
@@ -141,9 +140,6 @@ def codimensionMain():
     splash.showMessage("Importing packages...")
     from ui.mainwindow import CodimensionMainWindow
 
-    splash.showMessage("Building system wide modules list...")
-    buildSystemWideModulesList()
-
     splash.showMessage("Generating main window...")
     mainWindow = CodimensionMainWindow(splash, settings)
     codimensionApp.setMainWindow(mainWindow)

codimension/codimension.py

@@ -407,7 +407,7 @@ def __createToolbar(self):
         self.__toolbar.setMovable(False)
         self.__toolbar.setAllowedAreas(Qt.RightToolBarArea)
         self.__toolbar.setIconSize(QSize(16, 16))
-        self.__toolbar.setFixedWidth(28)
+        self.__toolbar.setFixedWidth(30)
         self.__toolbar.setContentsMargins(0, 0, 0, 0)
 
         # Buttons
@@ -434,6 +434,21 @@ def __createToolbar(self):
         self.__saveAsButton.setMenu(saveAsMenu)
         self.__saveAsButton.setFocusPolicy(Qt.NoFocus)
 
+        self.__levelUpButton = QToolButton(self)
+        self.__levelUpButton.setFocusPolicy(Qt.NoFocus)
+        self.__levelUpButton.setIcon(getIcon('levelup.png'))
+        self.__levelUpButton.setToolTip('Smart zoom level up (Alt+wheel)')
+        self.__levelIndicator = QLabel('<b>0</b>', self)
+        self.__levelIndicator.setToolTip('Current smart zoom level')
+        self.__levelIndicator.setAlignment(Qt.AlignCenter)
+        self.__levelDownButton = QToolButton(self)
+        self.__levelDownButton.setFocusPolicy(Qt.NoFocus)
+        self.__levelDownButton.setIcon(getIcon('leveldown.png'))
+        self.__levelDownButton.setToolTip('Smart zoom level down (Alt+wheel)')
+
+        fixedSpacer = QWidget()
+        fixedSpacer.setFixedHeight(10)
+
         self.__hideDocstrings = QToolButton(self)
         self.__hideDocstrings.setCheckable(True)
         self.__hideDocstrings.setIcon(getIcon('hidedocstrings.png'))
@@ -461,6 +476,10 @@ def __createToolbar(self):
 
         self.__toolbar.addWidget(self.__saveAsButton)
         self.__toolbar.addWidget(spacer)
+        self.__toolbar.addWidget(self.__levelUpButton)
+        self.__toolbar.addWidget(self.__levelIndicator)
+        self.__toolbar.addWidget(self.__levelDownButton)
+        self.__toolbar.addWidget(fixedSpacer)
         self.__toolbar.addWidget(self.__hideDocstrings)
         self.__toolbar.addWidget(self.__hideComments)
         self.__toolbar.addWidget(self.__hideExcepts)

codimension/editor/flowuiwidget.py

@@ -28,10 +28,10 @@
 from html import escape
 from utils.globals import GlobalData
 from utils.settings import Settings
-from utils.fileutils import isFileSearchable, isPythonFile, getFileContent
+from utils.fileutils import (isFileSearchable, isPythonFile, getFileContent,
+                             resolveLink)
 from utils.diskvaluesrelay import getFindInFilesHistory, setFindInFilesHistory
 from cdmpyparser import getBriefModuleInfoFromMemory
-from autocomplete.listmodules import resolveLink
 from .qt import (QCursor, Qt, QDialog, QDialogButtonBox, QVBoxLayout,
                  QSizePolicy, QLabel, QProgressBar, QApplication, QComboBox,
                  QGridLayout, QHBoxLayout, QCheckBox, QRadioButton,

codimension/pixmaps/leveldown.png

@@ -21,7 +21,8 @@
 """file related utils"""
 
 import os
-from os.path import islink, exists, split, join, sep, basename, realpath
+from os.path import (islink, exists, split, join, sep, basename, realpath,
+                     normpath, isabs, dirname)
 import logging
 import json
 import magic
@@ -730,3 +731,21 @@ def makeTempFile(prefix='cdm_', suffix=None):
     fileHandle, fileName = tempfile.mkstemp(suffix, prefix)
     os.close(fileHandle)
     return fileName
+
+
+def resolveLink(path):
+    """Resolves links and detects loops"""
+    paths_seen = []
+    while islink(path):
+        if path in paths_seen:
+            # Already seen this path, so we must have a symlink loop
+            return path, True
+        paths_seen.append(path)
+        # Resolve where the link points to
+        resolved = os.readlink(path)
+        if not isabs(resolved):
+            dir_name = dirname(path)
+            path = normpath(dir_name + sep + resolved)
+        else:
+            path = normpath(resolved)
+    return path, False