diff -r bca19a75be32 -r 38e8903f9c2f Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Apr 12 18:00:45 2015 +0200
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Tue Apr 14 19:51:10 2015 +0200
@@ -394,16 +394,13 @@
self.__lastFileItem = None
if codestring:
- self.source = codestring
+ source = codestring
+ encoding = Utilities.get_coding(source)
else:
try:
- self.source, encoding = Utilities.readEncodedFile(
+ source, encoding = Utilities.readEncodedFile(
self.filename)
- if encoding.endswith(
- ('-selected', '-default', '-guessed', '-ignore')):
- encoding = encoding.rsplit('-', 1)[0]
-
- self.source = self.source.splitlines(True)
+ source = source.splitlines(True)
except (UnicodeError, IOError) as msg:
self.noResults = False
self.__createResultItem(
@@ -414,6 +411,9 @@
# Continue with next file
self.check()
return
+ if encoding.endswith(
+ ('-selected', '-default', '-guessed', '-ignore')):
+ encoding = encoding.rsplit('-', 1)[0]
errors = []
self.__itms = []
@@ -426,7 +426,7 @@
errors, eol, encoding, Preferences.getEditor("CreateBackupFile")
]
self.styleCheckService.styleCheck(
- None, self.filename, self.source, args)
+ None, self.filename, source, args)
def __processResult(self, fn, codeStyleCheckerStats, fixes, results):
"""
