diff -r a3a4760b59ec -r d5aff4fd0ef8 eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Sun May 31 17:23:49 2020 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Thu Jun 04 17:57:20 2020 +0200
@@ -238,7 +238,7 @@
fp.write(txt)
except (IOError, UnicodeError) as err:
# Could not save the file! Skipping it. Reason: {0}
- return ("FWRITE_ERROR", (str(err),))
+ return ("FIXWRITE_ERROR", (str(err),))
return None
@@ -547,7 +547,7 @@
line += 1
# Triple single quotes converted to triple double quotes.
- return (1, "FD111", 0)
+ return (1, "FIXD111", 0)
def __fixD112(self, code, line, pos):
"""
@@ -577,7 +577,7 @@
)
self.__source[line] = newText
# Introductory quotes corrected to be {0}"""
- return (1, ('FD112', (insertChar,)), 0)
+ return (1, ('FIXD112', (insertChar,)), 0)
def __fixD121(self, code, line, pos, apply=False):
"""
@@ -614,7 +614,7 @@
self.__source[line] = docstring
self.__source[line + 1] = ""
# Single line docstring put on one line.
- return (1, "FD121", 0)
+ return (1, "FIXD121", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -660,7 +660,7 @@
if newText:
self.__source[line] = newText
# Period added to summary line.
- return (1, "FD131", 0)
+ return (1, "FIXD131", 0)
else:
return (0, "", 0)
@@ -684,7 +684,7 @@
line = line - 1
self.__source[line - 1] = ""
# Blank line before function/method docstring removed.
- return (1, "FD141", 0)
+ return (1, "FIXD141", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -710,7 +710,7 @@
line = line - 1
self.__source[line] = self.__eol + self.__source[line]
# Blank line inserted before class docstring.
- return (1, "FD142", 0)
+ return (1, "FIXD142", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -736,7 +736,7 @@
line = line - 1
self.__source[line] += self.__eol
# Blank line inserted after class docstring.
- return (1, "FD143", 0)
+ return (1, "FIXD143", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -766,7 +766,7 @@
self.__source[line] += self.__eol
# Blank line inserted after docstring summary.
- return (1, "FD144", 0)
+ return (1, "FIXD144", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -792,7 +792,7 @@
line = line - 1
self.__source[line] = self.__eol + self.__source[line]
# Blank line inserted after last paragraph of docstring.
- return (1, "FD145", 0)
+ return (1, "FIXD145", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -838,10 +838,10 @@
self.__source[line] = newText
if code == "D221":
# Leading quotes put on separate line.
- msg = "FD221"
+ msg = "FIXD221"
else:
# Trailing quotes put on separate line.
- msg = "FD222"
+ msg = "FIXD222"
return (1, msg, 0)
else:
fixId = self.__getID()
@@ -869,10 +869,10 @@
self.__source[line - 1] = ""
if code == "D242":
# Blank line before class docstring removed.
- msg = "FD242"
+ msg = "FIXD242"
else:
# Blank line before function/method docstring removed.
- msg = "FD244"
+ msg = "FIXD244"
return (1, msg, 0)
else:
fixId = self.__getID()
@@ -900,10 +900,10 @@
self.__source[line + 1] = ""
if code == "D243":
# Blank line after class docstring removed.
- msg = "FD243"
+ msg = "FIXD243"
else:
# Blank line after function/method docstring removed.
- msg = "FD245"
+ msg = "FIXD245"
return (1, msg, 0)
else:
fixId = self.__getID()
@@ -930,7 +930,7 @@
line = line - 1
self.__source[line - 1] = ""
# Blank line after last paragraph removed.
- return (1, "FD247", 0)
+ return (1, "FIXD247", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -957,10 +957,10 @@
self.__source[line - 1] = fixedLine
if code in ["E101", "W191"]:
# Tab converted to 4 spaces.
- msg = "FE101"
+ msg = "FIXE101"
else:
# Indentation adjusted to be a multiple of four.
- msg = "FE111"
+ msg = "FIXE111"
return (1, msg, 0)
else:
return (0, "", 0)
@@ -989,10 +989,10 @@
if changed:
if code == "E121":
# Indentation of continuation line corrected.
- msg = "FE121"
+ msg = "FIXE121"
elif code == "E124":
# Indentation of closing bracket corrected.
- msg = "FE124"
+ msg = "FIXE124"
return (1, msg, 0)
return (0, "", 0)
else:
@@ -1030,7 +1030,7 @@
self.__indentWord + text.lstrip()
)
# Missing indentation of continuation line corrected.
- return (1, "FE122", 0)
+ return (1, "FIXE122", 0)
return (0, "", 0)
else:
fixId = self.__getID()
@@ -1068,7 +1068,7 @@
changed = True
if changed:
# Closing bracket aligned to opening bracket.
- return (1, "FE123", 0)
+ return (1, "FIXE123", 0)
return (0, "", 0)
else:
fixId = self.__getID()
@@ -1104,7 +1104,7 @@
self.__indentWord + text.lstrip()
)
# Indentation level changed.
- return (1, "FE125", 0)
+ return (1, "FIXE125", 0)
return (0, "", 0)
else:
fixId = self.__getID()
@@ -1146,7 +1146,7 @@
changed = True
if changed:
# Indentation level of hanging indentation changed.
- return (1, "FE126", 0)
+ return (1, "FIXE126", 0)
return (0, "", 0)
else:
fixId = self.__getID()
@@ -1204,7 +1204,7 @@
changed = True
if changed:
# Visual indentation corrected.
- return (1, "FE127", 0)
+ return (1, "FIXE127", 0)
return (0, "", 0)
else:
fixId = self.__getID()
@@ -1236,7 +1236,7 @@
self.__source[line] = newText
# Extraneous whitespace removed.
- return (1, "FE201", 0)
+ return (1, "FIXE201", 0)
def __fixE221(self, code, line, pos):
"""
@@ -1263,7 +1263,7 @@
return (0, "", 0)
self.__source[line] = newText
- return (1, "FE221", 0)
+ return (1, "FIXE221", 0)
def __fixE225(self, code, line, pos):
"""
@@ -1304,7 +1304,7 @@
self.__source[line] = newText
# Missing whitespaces added.
- return (1, "FE225", 0)
+ return (1, "FIXE225", 0)
def __fixE231(self, code, line, pos):
"""
@@ -1327,7 +1327,7 @@
self.__source[line][pos:]
)
# Missing whitespace added.
- return (1, "FE231", 0)
+ return (1, "FIXE231", 0)
def __fixE251(self, code, line, pos):
"""
@@ -1362,7 +1362,7 @@
else:
self.__source[line] = newText
# Extraneous whitespace removed.
- return (1, "FE251", 0)
+ return (1, "FIXE251", 0)
def __fixE261(self, code, line, pos):
"""
@@ -1384,7 +1384,7 @@
newText = left + (" # " + right if right.strip() else right)
self.__source[line] = newText
# Whitespace around comment sign corrected.
- return (1, "FE261", 0)
+ return (1, "FIXE261", 0)
def __fixBlankLinesBefore(self, code, line, pos, apply=False):
"""
@@ -1428,7 +1428,7 @@
self.__source.insert(line, self.__eol)
delta += 1
# %n blank line(s) inserted.
- return (1, ("FE302+", blankLinesBefore - blanks), 0)
+ return (1, ("FIXE302+", blankLinesBefore - blanks), 0)
elif delta > 0:
# delete superfluous blank lines
while delta > 0:
@@ -1436,7 +1436,7 @@
line -= 1
delta -= 1
# %n superfluous line(s) removed.
- return (1, ("FE302-", blanks - blankLinesBefore), 0)
+ return (1, ("FIXE302-", blanks - blankLinesBefore), 0)
else:
return (0, "", 0)
else:
@@ -1469,7 +1469,7 @@
else:
break
# Superfluous blank lines after function decorator removed.
- return (1, "FE304", 0)
+ return (1, "FIXE304", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1511,7 +1511,7 @@
)
self.__source[line] = newText
# Imports were put on separate lines.
- return (1, "FE401", 0)
+ return (1, "FIXE401", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1560,7 +1560,7 @@
newNextText = ""
self.__source[line + 1] = newNextText
# Long lines have been shortened.
- return (1, "FE501", 0)
+ return (1, "FIXE501", 0)
else:
return (0, "", 0)
else:
@@ -1586,7 +1586,7 @@
self.__eol
)
# Redundant backslash in brackets removed.
- return (1, "FE502", 0)
+ return (1, "FIXE502", 0)
def __fixE701(self, code, line, pos, apply=False):
"""
@@ -1618,7 +1618,7 @@
)
self.__source[line] = newText
# Compound statement corrected.
- return (1, "FE701", 0)
+ return (1, "FIXE701", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1654,7 +1654,7 @@
second = text[pos:].lstrip("\n\r \t;")
self.__source[line] = first + self.__getIndent(text) + second
# Compound statement corrected.
- return (1, "FE702", 0)
+ return (1, "FIXE702", 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1696,7 +1696,7 @@
self.__source[line] = " ".join([left, center, right])
# Comparison to None/True/False corrected.
- return (1, "FE711", 0)
+ return (1, "FIXE711", 0)
def __fixN804(self, code, line, pos, apply=False):
"""
@@ -1742,7 +1742,7 @@
newText = left + center + right
self.__source[line] = newText
# '{0}' argument added.
- return (1, ("FN804", (arg,)), 0)
+ return (1, ("FIXN804", (arg,)), 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1804,7 +1804,7 @@
self.__source[line] = indent + right
# '{0}' argument removed.
- return (1, ("FN806", arg), 0)
+ return (1, ("FIXN806", arg), 0)
else:
fixId = self.__getID()
self.__stack.append((fixId, code, line, pos))
@@ -1826,7 +1826,7 @@
self.__source[line - 1] = re.sub(r'[\t ]+(\r?)$', r"\1",
self.__source[line - 1])
# Whitespace stripped from end of line.
- return (1, "FW291", 0)
+ return (1, "FIXW291", 0)
def __fixW292(self, code, line, pos):
"""
@@ -1843,7 +1843,7 @@
"""
self.__source[line - 1] += self.__eol
# newline added to end of file.
- return (1, "FW292", 0)
+ return (1, "FIXW292", 0)
def __fixW391(self, code, line, pos):
"""
@@ -1866,7 +1866,7 @@
else:
break
# Superfluous trailing blank lines removed from end of file.
- return (1, "FW391", 0)
+ return (1, "FIXW391", 0)
def __fixW603(self, code, line, pos):
"""
@@ -1883,7 +1883,7 @@
"""
self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=")
# '<>' replaced by '!='.
- return (1, "FW603", 0)
+ return (1, "FIXW603", 0)
class Reindenter(object):
