Eric Assistant: comparison AssistantEric/Assistant.py

-:db992524e3f5
+:842fce9b31ce
 @type Editor
 @return project type
 @rtype str
 """
 filename = editor.getFileName()
-if self.__project.isOpen() and filename and \
+if (
-self.__project.isProjectFile(filename):
+self.__project.isOpen() and
+filename and
+self.__project.isProjectFile(filename)
+):
 projectType = self.__project.getProjectType()
 else:
 projectType = ""
 return projectType
 # backward compatibility < 16.12
 language = editor.apiLanguage
 completeFromDocumentOnly = False
 if language in ["", "Guessed"] or language.startswith("Pygments|"):
-if self.__plugin.getPreferences("AutoCompletionSource") & \
+if (
-AcsDocument:
+self.__plugin.getPreferences("AutoCompletionSource") &
+AcsDocument
+):
 completeFromDocumentOnly = True
 else:
 return []
 projectType = self.__getProjectType(editor)
 if beg.endswith(wsep):
 sep = wsep
 break
 depth = 0
-while col > 0 and \
+while (
-not pat.match(text[col - 1]):
+col > 0 and
+not pat.match(text[col - 1])
+):
 ch = text[col - 1]
 if ch == ')':
 depth = 1
 # ignore everything back to the start of the
 while col > 0 and beg[col - 1] not in wseps:
 col -= 1
 if col > 0 and beg[col - 1] != " ":
 col -= 1
 prefix = editor.getWordLeft(line, col)
-if editor.isPy2File() or editor.isPy3File():
+if editor.isPyFile():
 from Utilities.ModuleParser import Module
 src = editor.text()
 fn = editor.getFileName()
 if fn is None:
 fn = ""
 mod = Module("", fn, imp.PY_SOURCE)
 mod.scan(src)
 importCompletion = False
-if editor.isPy2File() or editor.isPy3File():
+if editor.isPyFile():
 # check, if we are completing a from import statement
 maxLines = 10
 text = editor.text(line).strip()
 while maxLines and line > 0 and not text.startswith("from"):
 line -= 1
 api = self.__apisManager.getAPIs(
 language, projectType=projectType)
 apiCompletionsList = self.__getApiCompletions(
 api, word, context, prefix, module, editor)
-if self.__plugin.getPreferences("AutoCompletionSource") & \
+if (
-AcsProject:
+self.__plugin.getPreferences("AutoCompletionSource") &
+AcsProject
+):
 api = self.__apisManager.getAPIs(ApisNameProject)
 projectCompletionList = self.__getApiCompletions(
 api, word, context, prefix, module, editor)
-if self.__plugin.getPreferences("AutoCompletionSource") & AcsDocument \
+if (
-and not importCompletion:
+self.__plugin.getPreferences("AutoCompletionSource") &
+AcsDocument and
+not importCompletion
+):
 docCompletionsList = self.__getDocumentCompletions(
 editor, word, context, sep, prefix, module)
 completionsList = list(
 set(apiCompletionsList)
 completionsList = []
 if api is not None:
 if prefix and module and prefix == "self":
 line, col = editor.getCursorPosition()
 for cl in module.classes.values():
-if line >= cl.lineno and \
+if (
-(cl.endlineno == -1 or line <= cl.endlineno):
+line >= cl.lineno and
+(cl.endlineno == -1 or line <= cl.endlineno)
+):
 completions = []
 for superClass in cl.super:
 if prefix == word:
 completions.extend(
 api.getCompletions(
 line, col = editor.getCursorPosition()
 if prefix in ["cls", "self"]:
 prefixFound = True
 for cl in module.classes.values():
-if line >= cl.lineno and \
+if (
-(cl.endlineno == -1 or line <= cl.endlineno):
+line >= cl.lineno and
+(cl.endlineno == -1 or line <= cl.endlineno)
+):
 comps = []
 for method in cl.methods.values():
 if method.name == "__init__":
 continue
 # determine icon type
 iconID = Editor.MethodPrivateID
 elif method.isProtected():
 iconID = Editor.MethodProtectedID
 else:
 iconID = Editor.MethodID
-if (prefix == "cls" and
+if (
-method.modifier == method.Class) or \
+(prefix == "cls" and
-prefix == "self":
+method.modifier == method.Class) or
+prefix == "self"
+):
 comps.append((method.name, cl.name, iconID))
 if prefix != "cls":
 for attribute in cl.attributes.values():
 # determine icon type
 if attribute.isPrivate():
 cl = module.classes[prefix]
 comps = []
 for method in cl.methods.values():
 if method.name == "__init__":
 continue
-if doHierarchy or \
+if (
-method.modifier in [method.Class, method.Static]:
+doHierarchy or
+method.modifier in [method.Class, method.Static]
+):
 # determine icon type
 if method.isPrivate():
 if doHierarchy:
 continue
 iconID = Editor.MethodPrivateID
 else:
 completion = word
 line, index = editor.lineIndexFromPosition(pos)
 curWord = editor.getWord(line, index, useWordChars=False)
 completion += curWord[len(completion):]
-if completion and completion not in completionsList and \
+if (
-completion != word:
+completion and
+completion not in completionsList and
+completion != word
+):
 completionsList.append(
 "{0}?{1}".format(
 completion, self.__fromDocumentID))
 res = editor.findNextTarget()
 # backward compatibility < 16.12
 language = editor.apiLanguage
 completeFromDocumentOnly = False
 if language in ["", "Guessed"] or language.startswith("Pygments|"):
-if self.__plugin.getPreferences("AutoCompletionSource") & \
+if (
-AcsDocument:
+self.__plugin.getPreferences("AutoCompletionSource") &
+AcsDocument
+):
 completeFromDocumentOnly = True
 else:
 return []
 projectType = self.__getProjectType(editor)
 line, col = editor.lineIndexFromPosition(pos)
 wc = re.sub("\w", "", editor.wordCharacters())
 pat = re.compile("\w{0}".format(re.escape(wc)))
 text = editor.text(line)
-while col > 0 and \
+while col > 0 and not pat.match(text[col - 1]):
-not pat.match(text[col - 1]):
 col -= 1
 word = editor.getWordLeft(line, col)
 prefix = ""
 mod = None
 while col > 0 and beg[col - 1] not in wseps + [" ", "\t"]:
 col -= 1
 if col >= 0:
 col -= 1
 prefix = editor.getWordLeft(line, col)
-if editor.isPy2File() or editor.isPy3File():
+if editor.isPyFile():
 from Utilities.ModuleParser import Module
 src = editor.text()
 fn = editor.getFileName()
 if fn is None:
 fn = ""
 language, projectType=projectType)
 if api is not None:
 apiCalltips = self.__getApiCalltips(
 api, word, commas, prefix, mod, editor)
-if self.__plugin.getPreferences("AutoCompletionSource") & \
+if (
-AcsProject:
+self.__plugin.getPreferences("AutoCompletionSource") &
+AcsProject
+):
 api = self.__apisManager.getAPIs(ApisNameProject)
 projectCalltips = self.__getApiCalltips(
 api, word, commas, prefix, mod, editor)
 if self.__plugin.getPreferences("AutoCompletionSource") & AcsDocument:
 """
 calltips = []
 if prefix and module and prefix == "self":
 line, col = editor.getCursorPosition()
 for cl in module.classes.values():
-if line >= cl.lineno and \
+if (
-(cl.endlineno == -1 or line <= cl.endlineno):
+line >= cl.lineno and
+(cl.endlineno == -1 or line <= cl.endlineno)
+):
 for superClass in cl.super:
 calltips.extend(api.getCalltips(
 word, commas, superClass, None,
 self.__plugin.getPreferences(
 "CallTipsContextShown"),
 # prefix can be 'self', 'cls' or a class name
 sep = editor.getLexer().autoCompletionWordSeparators()[0]
 if prefix in ["self", "cls"]:
 line, col = editor.getCursorPosition()
 for cl in module.classes.values():
-if line >= cl.lineno and \
+if (
-(cl.endlineno == -1 or line <= cl.endlineno):
+line >= cl.lineno and
+(cl.endlineno == -1 or line <= cl.endlineno)
+):
 if word in cl.methods:
 method = cl.methods[word]
-if prefix == "self" or \
+if (
-(prefix == "cls" and
+prefix == "self" or
-method.modifier == method.Class):
+(prefix == "cls" and
+method.modifier == method.Class)
+):
 calltips.append(
 "{0}{1}{2}({3})".format(
 cl.name,
 sep,
 word,
 calltips.append("{0}({1})".format(
 word,
 ', '.join(method.parameters[1:])))
 return calltips
+#
+# eflag: noqa = M834, W605

Mercurial Repositories > Eric Assistant / file comparison

comparison: AssistantEric/Assistant.py

AssistantEric/Assistant.py