diff --git a/README.rst b/README.rst index e2e69643..7dea70c5 100644 --- a/README.rst +++ b/README.rst @@ -174,7 +174,24 @@ Building Building process is no longer distributed with this repository. You need to get SublimeCodeIntel/`CodeIntelSources `_ to run ``build.sh``. -More information in SublimeCodeIntel/CodeIntelSources/`src `_. +More information in SublimeCodeIntel/CodeIntelSources/`src `_. + + +Notes +----- + +For the next major version of SublimeCodeIntel (v3.0.0) you will have to ensure +that CodeIntel package (https://pypi.python.org/pypi/CodeIntel) is installed on +your system usually by using pip or easy_install. The Code intelligence will be +handled by that package and the command ``codeintel`` it will install. + + +Please start trying to install the CodeIntel package as soon as possible to make +sure you are ready for the upcoming version of SublimeCodeIntel: + +1. Install Python 2 and pip (http://www.pip-installer.org/en/latest/installing.html). + +2. Install (or upgrade) ``CodeIntel`` by typing the following in a terminal: ``pip install -U codeintel`` What's New @@ -183,6 +200,17 @@ What's New v3.0.0 (unreleased, alpha): + Uses CodeIntel as an OOP command and package. + Needs to install CodeIntel with pip: `pip install codeintel` + + +v2.2.0 (2015-03-26): + ++ Fixed issue with tabs and autocomplete + + +v2.1.9 (2015-03-21): + ++ Fixed issue with codeintel_enabled() v2.1.8 (2015-03-18): diff --git a/SublimeCodeIntel.py b/SublimeCodeIntel.py index 078e78af..6ed49f10 100644 --- a/SublimeCodeIntel.py +++ b/SublimeCodeIntel.py @@ -62,7 +62,7 @@ """ from __future__ import print_function, unicode_literals -VERSION = "2.1.8" +VERSION = "2.2.0" import os import re @@ -1390,7 +1390,7 @@ def setChangeCallbackToSettingsFile(self): # make sure all settings could be loaded and sublime is ready -def codeintel_enabled(default=False): +def codeintel_enabled(view=None, default=False): return settings_manager.sublime_auto_complete is not None @@ -1476,17 +1476,26 @@ def on_modified(self, view): if is_stop_char: hide_auto_complete(view) - # print('on_modified', view.command_history(1), view.command_history(0), view.command_history(-1)) - if (not hasattr(view, 'command_history') or view.command_history(1)[1] is None and ( - view.command_history(0)[0] == 'insert' and ( - view.command_history(0)[1]['characters'][-1] != '\n' - ) or - view.command_history(-1)[0] in ('insert', 'paste') and ( - view.command_history(0)[0] == 'commit_completion' or - view.command_history(0)[0] == 'insert_snippet' and view.command_history(0)[1]['contents'] == '($0)' - ) - )): - if view.command_history(0)[0] == 'commit_completion': + command_history = getattr(view, 'command_history', None) + if command_history: + redo_command = command_history(1) + previous_command = view.command_history(0) + before_previous_command = view.command_history(-1) + else: + redo_command = previous_command = before_previous_command = None + + # print('on_modified', "'%s'" % current_char, redo_command, previous_command, before_previous_command) + if not command_history or redo_command[1] is None and ( + previous_command[0] == 'paste' or + previous_command[0] == 'insert' and previous_command[1]['characters'][-1] not in ('\n', '\t') or + previous_command[0] == 'insert_snippet' and previous_command[1]['contents'] == '($0)' or + before_previous_command[0] in ('insert', 'paste') and ( + previous_command[0] == 'commit_completion' or + previous_command[0] == 'insert_completion' or + previous_command[0] == 'insert_best_completion' + ) + ): + if previous_command[0] == 'commit_completion': forms = ('calltips',) else: forms = ('calltips', 'cplns') diff --git a/messages.json b/messages.json index bb57bd27..ebe792e3 100644 --- a/messages.json +++ b/messages.json @@ -1,22 +1,6 @@ { "install": "messages/install.txt", - "1.2.0": "messages/1.2.0.txt", - "1.3.0": "messages/1.3.0.txt", - "1.4.0": "messages/1.4.0.txt", - "2.0.0": "messages/2.0.0.txt", - "2.0.1": "messages/2.0.1.txt", - "2.0.2": "messages/2.0.2.txt", - "2.0.3": "messages/2.0.3.txt", - "2.0.4": "messages/2.0.4.txt", - "2.0.5": "messages/2.0.5.txt", - "2.0.6": "messages/2.0.6.txt", - "2.1.0": "messages/2.1.0.txt", - "2.1.1": "messages/2.1.1.txt", - "2.1.2": "messages/2.1.2.txt", - "2.1.3": "messages/2.1.3.txt", - "2.1.4": "messages/2.1.4.txt", - "2.1.5": "messages/2.1.5.txt", - "2.1.6": "messages/2.1.6.txt", - "2.1.7": "messages/2.1.7.txt", - "2.1.8": "messages/2.1.8.txt" + "2.2.0": "messages/2.2.0.txt", + "2.2.0+st3": "messages/2.2.0.txt", + "3.0.0-beta6": "messages/3.0.0.txt" } \ No newline at end of file diff --git a/messages/2.1.9.txt b/messages/2.1.9.txt new file mode 100644 index 00000000..3ae3189d --- /dev/null +++ b/messages/2.1.9.txt @@ -0,0 +1,34 @@ +SublimeCodeIntel v2.1.9 Release Notes +===================================== + +A full-featured code intelligence and smart autocomplete engine for Sublime Text. +(Code intelligence plugin ported from Open Komodo Editor to Sublime Text) + +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! HELP WANTED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! Maintaining this project is hard, I do it in my spare time, but I'm !! +!! basically all alone. If anyone is interested in contributing, please !! +!! contact me. I really need much more help maintaining SublimeCodeIntel !! +!! !! +!! Follow me on twitter @germbravo !! +!! You can find us at #sublimecodeintel on irc.freenode.net !! +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +** Restart Sublime Text after reading this ** + +In case of trouble, please read the Troubleshooting section in the README. + +If you like SublimeCodeIntel, please make a donation: http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html + + +For more information: +--------------------- +Please take the time to read the documentation: + +* Online - http://sublimecodeintel.github.io/SublimeCodeIntel/ + + +CHANGES/FIXES +------------- +v2.1.9 (2015-03-21): + ++ Fixed issue with codeintel_enabled() diff --git a/messages/2.2.0.txt b/messages/2.2.0.txt new file mode 100644 index 00000000..a420a04e --- /dev/null +++ b/messages/2.2.0.txt @@ -0,0 +1,68 @@ + ____ _ _ _ ____ _ ___ _ _ +/ ___| _ _| |__ | (_)_ __ ___ ___ / ___|___ __| | ___|_ _|_ __ | |_ ___| | +\___ \| | | | '_ \| | | '_ ` _ \ / _ \ | / _ \ / _` |/ _ \| || '_ \| __/ _ \ | + ___) | |_| | |_) | | | | | | | | __/ |__| (_) | (_| | __/| || | | | || __/ | +|____/ \__,_|_.__/|_|_|_| |_| |_|\___|\____\___/ \__,_|\___|___|_| |_|\__\___|_| +A full-featured code intelligence and smart autocomplete engine for Sublime Text + (Code intelligence plugin ported from Open Komodo Editor to Sublime Text) + + ++-------------------------------- HELP WANTED ---------------------------------+ +| Maintaining this project is hard, I do it in my spare time, but I'm | +| basically all alone. If anyone is interested in contributing, please | +| contact me. I really need much more help maintaining SublimeCodeIntel | +| | +| Follow me on twitter @germbravo | +| You can find us at #sublimecodeintel on irc.freenode.net | +| | +| If you like SublimeCodeIntel, please make a donation: | +| http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html | ++------------------------------------------------------------------------------+ + + + +SublimeCodeIntel +================ + +A full-featured code intelligence and smart autocomplete engine for Sublime Text. +(Code intelligence plugin ported from Open Komodo Editor to Sublime Text) + + + +Release Notes for v2.2.0 +------------------------ + +For the next major version of SublimeCodeIntel (v3.0.0) you will have to ensure +that CodeIntel package (https://pypi.python.org/pypi/CodeIntel) is installed on +your system usually by using pip or easy_install. The Code intelligence will be +handled by that package and the command ``codeintel`` it will install in your +system. + + +Please start trying to install the CodeIntel package as soon as possible to make +sure you are ready for the upcoming version of SublimeCodeIntel: + +1. Install Python 2 and pip (http://www.pip-installer.org/en/latest/installing.html). + +2. Install (or upgrade) ``CodeIntel`` by typing the following in a terminal: ``pip install -U codeintel`` + + +** Restart Sublime Text after reading this ** + + + +More information +---------------- +Please take the time to read the documentation: + +In case of trouble, please read the Troubleshooting section in the README. + +* Online - http://sublimecodeintel.github.io/SublimeCodeIntel/ +* Git - https://github.com/SublimeCodeIntel/SublimeCodeIntel + + +CHANGES/FIXES +------------- +v2.2.0 (2015-03-26): + ++ Fixed issue with tabs and autocomplete diff --git a/messages/3.0.0.txt b/messages/3.0.0.txt index 523f9d6e..e1b0fd5c 100644 --- a/messages/3.0.0.txt +++ b/messages/3.0.0.txt @@ -1,34 +1,66 @@ -SublimeCodeIntel v3.0.0 Release Notes -===================================== + ____ _ _ _ ____ _ ___ _ _ +/ ___| _ _| |__ | (_)_ __ ___ ___ / ___|___ __| | ___|_ _|_ __ | |_ ___| | +\___ \| | | | '_ \| | | '_ ` _ \ / _ \ | / _ \ / _` |/ _ \| || '_ \| __/ _ \ | + ___) | |_| | |_) | | | | | | | | __/ |__| (_) | (_| | __/| || | | | || __/ | +|____/ \__,_|_.__/|_|_|_| |_| |_|\___|\____\___/ \__,_|\___|___|_| |_|\__\___|_| +A full-featured code intelligence and smart autocomplete engine for Sublime Text + (Code intelligence plugin ported from Open Komodo Editor to Sublime Text) + + ++-------------------------------- HELP WANTED ---------------------------------+ +| Maintaining this project is hard, I do it in my spare time, but I'm | +| basically all alone. If anyone is interested in contributing, please | +| contact me. I really need much more help maintaining SublimeCodeIntel | +| | +| Follow me on twitter @germbravo | +| You can find us at #sublimecodeintel on irc.freenode.net | +| | +| If you like SublimeCodeIntel, please make a donation: | +| http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html | ++------------------------------------------------------------------------------+ + + + +SublimeCodeIntel +================ A full-featured code intelligence and smart autocomplete engine for Sublime Text. (Code intelligence plugin ported from Open Komodo Editor to Sublime Text) -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! HELP WANTED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! Maintaining this project is hard, I do it in my spare time, but I'm !! -!! basically all alone. If anyone is interested in contributing, please !! -!! contact me. I really need much more help maintaining SublimeCodeIntel !! -!! !! -!! Follow me on twitter @germbravo !! -!! You can find us at #sublimecodeintel on irc.freenode.net !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -** Restart Sublime Text after reading this ** -In case of trouble, please read the Troubleshooting section in the README. +Release Notes for v3.0.0-beta6 +------------------------------ + +SublimeCodeIntel v3 requires the CodeIntel Package (which is a Python 2 package) +[https://pypi.python.org/pypi/CodeIntel] and it should be installed on your +system usually by using pip or easy_install. The Code Intelligence is handled by +that package and the command ``codeintel`` it will install in your system. + -If you like SublimeCodeIntel, please make a donation: http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html +SublimeCodeIntel v3.0.0-beta6 requires CodeIntel v0.9.3. Make sure it's updated! + +1. Install Python 2 and pip (http://www.pip-installer.org/en/latest/installing.html). + +2. Install (or upgrade) ``CodeIntel`` by typing the following in a terminal: + ``pip install -U codeintel`` -For more information: ---------------------- Please take the time to read the documentation: * Online - http://sublimecodeintel.github.io/SublimeCodeIntel/ +* Git - https://github.com/SublimeCodeIntel/SublimeCodeIntel + +In case of trouble, please read the Troubleshooting section in the README. + +** Restart Sublime Text after reading all this ** + + +What's New +---------- -CHANGES/FIXES -------------- v3.0.0 (unreleased, alpha): + Uses CodeIntel as an OOP command and package. + Needs to install CodeIntel with pip: `pip install -U codeintel` diff --git a/messages/install.txt b/messages/install.txt index 46099664..0d8d077b 100644 --- a/messages/install.txt +++ b/messages/install.txt @@ -1,31 +1,39 @@ -SublimeCodeIntel -================ + ____ _ _ _ ____ _ ___ _ _ +/ ___| _ _| |__ | (_)_ __ ___ ___ / ___|___ __| | ___|_ _|_ __ | |_ ___| | +\___ \| | | | '_ \| | | '_ ` _ \ / _ \ | / _ \ / _` |/ _ \| || '_ \| __/ _ \ | + ___) | |_| | |_) | | | | | | | | __/ |__| (_) | (_| | __/| || | | | || __/ | +|____/ \__,_|_.__/|_|_|_| |_| |_|\___|\____\___/ \__,_|\___|___|_| |_|\__\___|_| +A full-featured code intelligence and smart autocomplete engine for Sublime Text + (Code intelligence plugin ported from Open Komodo Editor to Sublime Text) -A full-featured code intelligence and smart autocomplete engine for Sublime Text. -(Code intelligence plugin ported from Open Komodo Editor to Sublime Text) -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! HELP WANTED !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! Maintaining this project is hard, I do it in my spare time, but I'm !! -!! basically all alone. If anyone is interested in contributing, please !! -!! contact me. I really need much more help maintaining SublimeCodeIntel !! -!! !! -!! Follow me on twitter @germbravo !! -!! You can find us at #sublimecodeintel on irc.freenode.net !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ++-------------------------------- HELP WANTED ---------------------------------+ +| Maintaining this project is hard, I do it in my spare time, but I'm | +| basically all alone. If anyone is interested in contributing, please | +| contact me. I really need much more help maintaining SublimeCodeIntel | +| | +| Follow me on twitter @germbravo | +| You can find us at #sublimecodeintel on irc.freenode.net | +| | +| If you like SublimeCodeIntel, please make a donation: | +| http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html | ++------------------------------------------------------------------------------+ -** Restart Sublime Text after reading this ** -In case of trouble, please read the Troubleshooting section in the README. - -If you like SublimeCodeIntel, please make a donation: http://sublimecodeintel.github.io/SublimeCodeIntel/donate.html +SublimeCodeIntel +================ -Features: ---------- +A full-featured code intelligence and smart autocomplete engine for Sublime Text. +(Code intelligence plugin ported from Open Komodo Editor to Sublime Text) Supports all the languages Komodo Editor supports for Code Intelligence (CIX, CodeIntel2): -JavaScript, Mason, XBL, XUL, RHTML, SCSS, Python, HTML, Ruby, Python3, XML, Sass, XSLT, Django, HTML5, Perl, CSS, Twig, Less, Smarty, Node.js, Tcl, TemplateToolkit, PHP. +ActionScript, Django, Docker, EJS, epMojo, HTML, KomodoSnippet, LaravelBlade, +Mason, Mustache, MXML, PHP, R, reStructuredText, RHTML, Smarty, TracWiki, +TemplateToolkit, Twig, XBL, XML, XSLT, XUL, +Python, Python3, Ruby, Perl, Go, JavaScript, Node.js, CSS, SCSS, Sass, Less, +HTML5, Tcl. Provides the following features: @@ -56,17 +64,15 @@ Provides the following features: * Manual CodeIntel = ``Control+Shift+space`` -For more information: ---------------------- + +Release Notes +------------- + Please take the time to read the documentation: * Online - http://sublimecodeintel.github.io/SublimeCodeIntel/ +* Git - https://github.com/SublimeCodeIntel/SublimeCodeIntel +In case of trouble, please read the Troubleshooting section in the README. -IMPORTANT - -Do NOT edit the default SublimeCodeIntel settings. Your changes will be lost -when SublimeCodeIntel is updated. ALWAYS edit the user SublimeCodeIntel settings -by selecting "Preferences->Package Settings->SublimeCodeIntel->Settings - User". -Note that individual settings you include in your user settings will **completely** -replace the corresponding default setting, so you must provide that setting in its entirety. +** Restart Sublime Text after reading all this ** diff --git a/packages.json b/packages.json index ec544de1..8d1aceba 100644 --- a/packages.json +++ b/packages.json @@ -13,20 +13,21 @@ "releases": [ { "sublime_text": "<3000", - "version": "2.1.8", - "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v2.1.8.zip", - "date": "2015-03-18 00:00:00" + "version": "2.2.0", + "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v2.2.0.zip", + "date": "2015-03-26 00:00:00" }, { "sublime_text": ">=3000", - "version": "2.1.8+st3", - "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v2.1.8+st3.zip", - "date": "2015-03-18 00:00:00" + "version": "2.2.0+st3", + "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v2.2.0+st3.zip", + "date": "2015-03-26 00:00:00" }, { - "version": "3.0.0-alpha1", - "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v3.0.0-alpha1.zip", - "date": "2015-03-18 00:00:00" + "sublime_text": "*", + "version": "3.0.0-beta6", + "url": "https://github.com/SublimeCodeIntel/SublimeCodeIntel/archive/v3.0.0-beta6.zip", + "date": "2015-11-07 00:00:00" } ] }