Skip to content

Commit 79e60a7

Browse files
committed
Merge branch 'development'
2 parents 675e7d8 + fa0e58e commit 79e60a7

5 files changed

Lines changed: 32 additions & 6 deletions

File tree

README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
CTags
33
=====
44

5-
.. image:: https://travis-ci.org/SublimeText/CTags.png?branch=development :target: https://travis-ci.org/SublimeText/CTags
5+
.. image:: https://travis-ci.org/SublimeText/CTags.svg?branch=development
6+
:target: https://travis-ci.org/SublimeText/CTags
67

78
About
89
=====

ctags.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,11 @@ def resort_ctags(tag_file):
360360
"""
361361
keys = {}
362362

363-
with codecs.open(tag_file, encoding='utf-8', errors='ignore') as fh:
363+
with codecs.open(tag_file, encoding='utf-8', errors='replace') as fh:
364364
for line in fh:
365365
keys.setdefault(line.split('\t')[FILENAME], []).append(line)
366366

367-
with codecs.open(tag_file+'_sorted_by_file', 'w', encoding='utf-8', errors='ignore') as fw:
367+
with codecs.open(tag_file+'_sorted_by_file', 'w', encoding='utf-8', errors='replace') as fw:
368368
for k in sorted(keys):
369369
for line in keys[k]:
370370
split = line.split('\t')

ctagsplugin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ def find_with_scope(view, pattern, scope, start_pos=0, cond=True, flags=0):
316316
max_pos = view.size()
317317

318318
while start_pos < max_pos:
319+
estrs = pattern.split('\ufffd')
320+
if(len(estrs)>1):pattern = estrs[0]
319321
f = view.find(pattern, start_pos, flags)
320322

321323
if not f or view.match_selector(f.begin(), scope) is cond:
@@ -352,7 +354,7 @@ def follow_tag_path(view, tag_path, pattern):
352354
if setting('debug'): # leave a visual trail for easy debugging
353355
regions = regions + ([pattern_region] if pattern_region else [])
354356
view.erase_regions('tag_path')
355-
view.add_regions('tag_path', regions, 'comment', 1)
357+
view.add_regions('tag_path', regions, 'comment', '', 1)
356358

357359
return pattern_region.begin() - 1 if pattern_region else None
358360

@@ -409,7 +411,7 @@ def format_tag_for_quickopen(tag, show_path=True):
409411
f += string.Template(
410412
' %($field)s$punct%(symbol)s').substitute(locals())
411413

412-
format = [(f or tag.symbol) % tag, tag.ex_command]
414+
format = [f % tag if f else tag.symbol, tag.ex_command]
413415
format[1] = format[1].strip()
414416

415417
if show_path:

messages.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
"0.3.5": "messages/0.3.5.md",
99
"0.3.6": "messages/0.3.6.md",
1010
"0.3.7": "messages/0.3.7.md",
11-
"0.3.8": "messages/0.3.8.md"
11+
"0.3.8": "messages/0.3.8.md",
12+
"0.3.9": "messages/0.3.9.md"
1213
}

messages/0.3.9.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Changes in 0.3.8
2+
================
3+
4+
- Add build ctags options to sidebar
5+
- Bug Fixes
6+
7+
Fixes
8+
=====
9+
10+
* Add missing 'icon' parameter to 'add_regions', #261
11+
* Fix accidentally using a symbol as a format string, #264
12+
* Fix issues with non-UTF8 charset, #267
13+
14+
Resolves
15+
========
16+
17+
N/A
18+
19+
*******************************************************************************
20+
21+
For more detailed information about these changes, run ``git v0.3.8..v0.3.9``
22+
on the Git repository found [here](https://github.com/SublimeText/CTags).

0 commit comments

Comments
 (0)