Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix syntax highlighting breaking is comments are present inside rules

Browse Source
This commit is contained in:
Kovid Goyal 2013-12-06 10:45:34 +05:30
parent 91cad6bbcf
commit a862a3d72f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/tweak_book/editor/syntax/css.py
View File

@ -121,10 +121,11 @@ content_tokens = [(re.compile(k), v, n) for k, v, n in [
class State(object): class State(object):
NORMAL = 0 NORMAL = 0
IN_COMMENT = 1 IN_COMMENT_NORMAL = 1
IN_SQS = 2 IN_SQS = 2
IN_DQS = 3 IN_DQS = 3
IN_CONTENT = 4 IN_CONTENT = 4
IN_COMMENT_CONTENT = 5
def __init__(self, num): def __init__(self, num):
self.parse = num & 0b1111 self.parse = num & 0b1111
@ -142,7 +143,7 @@ def normal(state, text, i, formats):
return [(len(m.group()), None)] return [(len(m.group()), None)]
cdo = cdo_pat.match(text, i) cdo = cdo_pat.match(text, i)
if cdo is not None: if cdo is not None:
state.parse = State.IN_COMMENT state.parse = State.IN_COMMENT_NORMAL
return [(len(cdo.group()), formats['comment'])] return [(len(cdo.group()), formats['comment'])]
if text[i] == '"': if text[i] == '"':
state.parse = State.IN_DQS state.parse = State.IN_DQS
@ -168,7 +169,7 @@ def content(state, text, i, formats):
return [(len(m.group()), None)] return [(len(m.group()), None)]
cdo = cdo_pat.match(text, i) cdo = cdo_pat.match(text, i)
if cdo is not None: if cdo is not None:
state.parse = State.IN_COMMENT state.parse = State.IN_COMMENT_CONTENT
return [(len(cdo.group()), formats['comment'])] return [(len(cdo.group()), formats['comment'])]
if text[i] == '"': if text[i] == '"':
state.parse = State.IN_DQS state.parse = State.IN_DQS
@ -195,7 +196,7 @@ def comment(state, text, i, formats):
pos = text.find('*/', i) pos = text.find('*/', i)
if pos == -1: if pos == -1:
return [(len(text), formats['comment'])] return [(len(text), formats['comment'])]
state.parse = State.NORMAL state.parse = State.NORMAL if state.parse == State.IN_COMMENT_NORMAL else State.IN_CONTENT
return [(pos - i + 2, formats['comment'])] return [(pos - i + 2, formats['comment'])]
def in_string(state, text, i, formats): def in_string(state, text, i, formats):
@ -213,7 +214,8 @@ def in_string(state, text, i, formats):
state_map = { state_map = {
State.NORMAL:normal, State.NORMAL:normal,
State.IN_COMMENT: comment, State.IN_COMMENT_NORMAL: comment,
State.IN_COMMENT_CONTENT: comment,
State.IN_SQS: in_string, State.IN_SQS: in_string,
State.IN_DQS: in_string, State.IN_DQS: in_string,
State.IN_CONTENT: content, State.IN_CONTENT: content,