Merge remote-tracking branch 'peter-b/master'

Author: macMikey

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.6.1 - Improvements to documentation and LiveCode Script support
+
+* Revised, expanded and generally improved documentation (issue #19)
+* Improved LiveCode Script support
+  * Support for `if...then...else...` syntax
+  * Better indentation in `switch` blocks
+  * Restore completion of symbols from the current file (issue #18)
+  * Don't clobber autocomplete settings (issue #16)
+  * Improved variable & constant capturing
+* Restored support for linting revIgniter files
+
 ## 0.6.0 - Linting and script-only stacks
 * LiveCode Script grammar and snippets generated from documentation
 * Support for script-only stacks (`.livecodescript`)

README.md

@@ -1,89 +1,111 @@
-# LiveCode Language package for Atom
+# LiveCode language package for Atom
 
 ![LiveCode Community Logo](http://livecode.com/wp-content/uploads/2015/02/livecode-logo.png)
 
-This is a language package for Atom that provides support for editing
-[LiveCode](http://livecode.com/) source code.
+This is a language package that lets you edit [LiveCode](http://livecode.com/)
+source code in the Atom editor.  It adds support for:
 
-LiveCode is an open source platform provides a way to build applications for
-mobile, desktop and server platforms. The visual workflow allows the user to
-develop apps "live", using a powerful and uniquely-accessible language syntax.
+* LiveCode Builder source code (`.lcb`)
+* LiveCode server source code (`.lc` and `.irev`)
+* LiveCode script-only stacks (`.livecodescript`)
 
-The LiveCode server syntax and revIgniter snippets were converted from the
-TextMate bundles available from the [revIgniter](http://revigniter.com/)
-website.
+## Installing
+
+Using the Atom package manager:
+
+* Visit Atom's "Settings" view, and go to the "Install" tab
+* Use the search field to search for the **language-livecode** package
+* Click "Install"
+
+Using the command line: `apm install language-livecode`
 
-## Supported languages
+See also the [Atom Packages](https://atom.io/docs/v1.0.19/using-atom-atom-packages)
+section in the Atom Flight Manual.
 
-Currently, this package supports editing:
+## Configuration
 
-* LiveCode Builder source code in `.lcb` files
-* LiveCode server source code in `.lc` and `.irev` files
-* LiveCode Script source code in `.livecodescript` files, where the shebang line
-contains `livecode` or the first line contains an Emacs mode comment
-`# -*- mode:livecodescript -*-`
+The settings for LiveCode integration can also be modified using Atom's
+"Settings" view.  Go to the "Packages" tab, find the **language-livecode**
+package, and click its "Settings" button.
 
-The package provides syntax highlighting, highlighting and indentation support
-for all the supported languages.
+See also the
+[Package Settings](https://atom.io/docs/v1.0.19/using-atom-atom-packages#package-settings)
+section in the Atom Flight Manual.
 
-It also provides snippets to enhance LiveCode server script and revIgniter
-script development.
+## Usage
 
-For LiveCode Script there are quite a number of autocomplete snippets generated
-from the LiveCode documentation.
+**language-livecode** integrates LiveCode editing into the Atom editor.  Note
+that it doesn't make Atom behave like the LiveCode IDE, and it doesn't
+integrate with or replace the LiveCode IDE's script editor.
 
-## Installation
+### Syntax highlighting and indentation
 
-Install the `language-livecode` package from the "Install Packages and Themes"
-view in Atom's "Settings" window.
+The package adds automatic syntax highlighting and indentation for all of the
+supported LiveCode language types.
 
-You may also wish to install the [revIgniter theme](https://atom.io/themes/revigniter-syntax)
-for Atom.
+The optional [revigniter-syntax](https://atom.io/themes/revigniter-syntax)
+can be installed to provide a colour theme that's tailored for LiveCode source
+code.
 
-## Script Error Checking
+### Autocompletion
 
-This package provides a linter for LiveCode Script, LiveCode Server and LiveCode
-Builder to highlight and describe script compilation errors on the fly.
+The package also includes autocompletion support for symbols in the current
+file, along with snippets for many common LiveCode Builder and LiveCode Script
+syntax elements.
 
-![Linter In Action](http://ecove.on-rev.com/linter.gif)
+### Script error checking ("linting")
 
-Dependencies:
+If you have the [linter](https://atom.io/packages/linter) package installed,
+you can enable script error checking support.  This highlights and describes
+script compilation errors as you work.
 
- * The [linter package](https://atom.io/packages/linter) needs to be installed
- * LiveCode 7.1+ Server engine for the platform it is being run on must be
- accessible
+![Linter in action](http://ecove.on-rev.com/linter.gif)
 
-The default setting assumes you have installed the LiveCode Server engine somewhere
-on the current `$PATH` with the name `livecode-server`. However, you can enter any
-path or name you choose via the package settings.
+#### LiveCode Script linting
 
-For LiveCode Server the linter will only check for errors within the scope of
-the file being edited. If for example a variable re-declarition error is caused
-by the inclusion of another file that error won't be detected.
+You will need to
+[download LiveCode server](https://downloads.livecode.com/livecode) and install
+(by unzipping it somewhere appropriate).  LiveCode Server 7.1.0 or later is
+required.
 
-The linter supports an optional explicit variables mode which can be turned on
-via the package settings.
+Next, go to the package settings and put the full path to the LiveCode server
+program that you just extracted (e.g. `/path/to/livecode-community-server`)
+into the "LiveCode Server Engine Path" setting.
 
-### LiveCode Builder Linting
+It's often useful to enable the "Explicit Variables" setting to get an error
+when you use a variable name that you haven't declared with `local` or
+`global`.
 
-Linting of LiveCode Builder files should be considered experimental. This is
-particularly the case for projects that have complex interdependencies between
-files.
+**Note:** When checking LiveCode Server source files, the linter will only
+check for errors in the file currently being edited.  If, for example, the file
+you're editing includes another file and that inclusion causes a variable
+re-declaration error, the linter will not detect it.
 
-In order to lint LiveCode Builder files ensure the following:
+#### LiveCode Builder linting
 
- * lc-compile can be found at the location specified in settings
- * You have appropriately set the module paths to a directory with the standard
-`*.lci` files provided by LiveCode. You may add further paths delimited by `;`
+**Warning:** Linting for LiveCode Builder source code is **experimental**.
 
-The default settings assume you have a clone of the LiveCode repo in
-your home directory named livecode and you have built a debug build.
+You need LiveCode 8 installed to use LiveCode Builder linting.  The LiveCode
+IDE's installation location contains the LiveCode Builder compiler, called
+**lc-compile**.  In the package settings, set the "Compiler Path for LiveCode
+Builder" to the full path to the compiler (e.g. `/path/to/lc-compile`).
 
-In the process of linting the LiveCode Builder file a `*.lci` file is created in
-a directory named `.lci` next to the file being edited. In the case of files
-that have dependencies you may receive a dependency error if you edit a
-file with the dependency before those it depends on because it won't be able to
-fine the appropriate `*.lci` file in the `.lci` directory.
+The LiveCode Builder compiler also needs to know where to find the `.lci`
+interface files which provide the built-in modules' interface information.
+These are usually located in a `modules` directory near the **lc-compile**
+program in the LiveCode IDE's installation location.  You should put this
+path in the "Module Paths For LiveCode Builder" setting.
+
+If you are working on a complex project and you need **lc-compile** to look for
+`.lci` files in multiple places, you can put multiple paths in the "Module
+Paths for LiveCode Builder" setting, separated by `;` characters.
+
+**Notes:** The linting step will automatically create a `.lci` working
+directory in the directory where the LCB file is located.  The linter puts the
+interface files for the files that are being linted in that directory.  You may
+get dependency errors if you edit an LCB module which has dependencies before
+editing the module that it depends on, because the `.lci` working directory
+will have missing interface files.
 
 ## Authors
 
@@ -92,6 +114,10 @@ fine the appropriate `*.lci` file in the `.lci` directory.
 * Monte Goulding
 * Adam Robertson
 
+The LiveCode server syntax and revIgniter snippets were converted from the
+TextMate bundles available from the [revIgniter](http://revigniter.com/)
+website.
+
 ## Reporting bugs and contributing
 
 Please report any problems to the [GitHub issues tracker]( https://github.com/peter-b/atom-language-livecode/issues).

grammars/livecodescript.cson

@@ -19,6 +19,10 @@ repository:
         match: "(?i)\\b(SIX|TEN|FORMFEED|NINE|ZERO|NONE|SPACE|FOUR|FALSE|COLON|CRLF|PI|COMMA|ENDOFFILE|EOF|EIGHT|FIVE|QUOTE|EMPTY|ONE|TRUE|((?<=\\w\\s)RETURN)|CR|LINEFEED|RIGHT|BACKSLASH|NULL|SEVEN|TAB|THREE|TWO)\\b"
         name: "constant.language.livecodescript"
       }
+      {
+        match: "\\bk[A-Z]{1}.*?\\b"
+        name: "constant.language.livecodescript"
+      }
     ]
   language:
     patterns: [
@@ -55,7 +59,7 @@ repository:
         'name': 'comment.line.livecodescript'
       }
       {
-        match: "\\b(after|byte(s)*|codepoint(s)*|codeunit(s)*|english|segment(s)*|sentence(s)*|paragraph|the|trueWord(s)*|until|word(s)*|http|forever|descending|using|line|real8|with|seventh|for|stdout|finally|element|word|fourth|before|black|ninth|sixth|characters|chars|stderr|uInt(1|1s|2|2s)|stdin|string|lines|relative|rel|any|fifth|items|from|middle|mid|at|else|of|catch|then|third|it|file|milli(seconds|second|secs|sec)|int(1|1s|4|4s|ernet|2|2s)|normal|text|item|last|long|detailed|effective|uInt4|uInt4s|se(conds|cond|cs|c)|repeat|end\\s+repeat|URL|in|end\\s+try|into|switch|end\\s+switch|to|words|https|token|binfile|each|tenth|as|ticks|tick|system|real4|by|dateItems|without|cha(r|racter)|ascending|eighth|whole|dateTime|numeric|short|first|ftp|integer|abbreviated|abb(r|rev)|private|case|while|if|end\\s+if)\\b"
+        match: "\\b(after|byte(s)*|codepoint(s)*|codeunit(s)*|english|segment(s)*|sentence(s)*|paragraph|the|trueWord(s)*|until|word(s)*|http|forever|descending|using|line|real8|with|seventh|for|stdout|finally|element|word|fourth|before|black|ninth|sixth|characters|chars|stderr|uInt(1|1s|2|2s)|stdin|string|lines|relative|rel|any|fifth|items|from|middle|mid|at|else|of|catch|then|third|it|file|milli(seconds|second|secs|sec)|int(1|1s|4|4s|ernet|2|2s)|normal|text|item|last|long|detailed|effective|uInt4|uInt4s|se(conds|cond|cs|c)|repeat|end\\s+repeat|URL|in|end\\s+try|into|switch|end\\s+switch|to|words|https|token|binfile|each|tenth|as|ticks|tick|system|real4|by|dateItems|without|cha(r|racter)|ascending|eighth|whole|dateTime|numeric|short|first|ftp|integer|abbreviated|abb(r|rev)|private|case|default|while|if|end\\s+if)\\b"
         name: "keyword.control.livecodescript"
       }
       {
@@ -165,29 +169,17 @@ repository:
       }
     ]
   var_global:
-    captures:
-      "1":
-        name: "punctuation.definition.variable.livecodescript"
-    match: "\\b(g)[A-Z]{1}.*?\\b"
+    match: "\\bg[A-Z]{1}.*?\\b"
     name: "variable.other.global.livecodescript"
   var_local:
-    captures:
-      "1":
-        name: "punctuation.definition.variable.livecodescript"
-    match: "\\b(t|the)[A-Z]{1}.*?\\b"
-    name: "variable.other.global.livecodescript"
+    match: "\\bt[he]*[A-Z]{1}.*?\\b"
+    name: "variable.other.local.livecodescript"
   var_parameter:
-    captures:
-      "1":
-        name: "punctuation.definition.variable.livecodescript"
-    match: "\\b(p)[A-Z]{1}.*?\\b"
-    name: "variable.parameter.livecodescript"
+    match: "\\bp[A-Z]{1}.*?\\b"
+    name: "variable.other.param.livecodescript"
   var_scriptLocal:
-    captures:
-      "1":
-        name: "punctuation.definition.variable.livecodescript"
-    match: "\\b(s)[A-Z]{1}.*?\\b"
-    name: "variable.other.global.livecodescript"
+    match: "\\bs[A-Z]{1}.*?\\b"
+    name: "variable.other.scriptlocal.livecodescript"
   var_server:
     match: "\\$_[A-Z]+"
     name: "variable.other.server.livecodescript"

lib/main.coffee

@@ -62,7 +62,7 @@ module.exports =
 
   provideLinter: ->
     provider =
-      grammarScopes: ['source.livecodescript', 'source.lcb']
+      grammarScopes: ['source.livecodescript', 'source.iRev', 'source.lcb']
       scope: 'file'
       lintOnFly: true
       lint: (textEditor) =>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "language-livecode",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Support for editing LiveCode source code",
   "repository": "https://github.com/peter-b/atom-language-livecode",
   "license": "GPLv3",