Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py

Issue 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (C) 2011 Apple Inc. All rights reserved. 1 # Copyright (C) 2011 Apple Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions 4 # modification, are permitted provided that the following conditions
5 # are met: 5 # are met:
6 # 1. Redistributions of source code must retain the above copyright 6 # 1. Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # 2. Redistributions in binary form must reproduce the above copyright 8 # 2. Redistributions in binary form must reproduce the above copyright
9 # notice, this list of conditions and the following disclaimer in the 9 # notice, this list of conditions and the following disclaimer in the
10 # documentation and/or other materials provided with the distribution. 10 # documentation and/or other materials provided with the distribution.
(...skipping 20 matching lines...) Expand all
31 31
32 categories = set(('json/syntax',)) 32 categories = set(('json/syntax',))
33 33
34 def __init__(self, file_path, handle_style_error): 34 def __init__(self, file_path, handle_style_error):
35 self._handle_style_error = handle_style_error 35 self._handle_style_error = handle_style_error
36 self._handle_style_error.turn_off_line_filtering() 36 self._handle_style_error.turn_off_line_filtering()
37 37
38 def check(self, lines): 38 def check(self, lines):
39 try: 39 try:
40 json.loads('\n'.join(lines) + '\n') 40 json.loads('\n'.join(lines) + '\n')
41 except ValueError, e: 41 except ValueError as e:
42 self._handle_style_error(self.line_number_from_json_exception(e), 'j son/syntax', 5, str(e)) 42 self._handle_style_error(self.line_number_from_json_exception(e), 'j son/syntax', 5, str(e))
43 43
44 @staticmethod 44 @staticmethod
45 def line_number_from_json_exception(error): 45 def line_number_from_json_exception(error):
46 match = re.search(r': line (?P<line>\d+) column \d+', str(error)) 46 match = re.search(r': line (?P<line>\d+) column \d+', str(error))
47 if not match: 47 if not match:
48 return 0 48 return 0
49 return int(match.group('line')) 49 return int(match.group('line'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698