Merge branch 'release/1.1.3'

.travis.yml

@@ -20,13 +20,14 @@ addons:
 
 before_install:
   - |
+    nvm install 8.9.3 || exit 2
     if [ $TRAVIS_OS_NAME == "linux" ]; then
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start
       sleep 3
     else
-      brew tap caskroom/cask       || exit 2
-      brew cask install powershell || exit 2
+      curl https://github.com/PowerShell/PowerShell/releases/download/v6.1.1/powershell-6.1.1-osx-x64.pkg -Lo /tmp/pwsh.pkg || exit 2
+      sudo installer -pkg /tmp/pwsh.pkg -target / || exit 2
     fi
 
 script: pwsh -NonInteractive -NoProfile -NoLogo scripts/ci.ps1

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 [See the full changelog in the end-user documentation](https://vector-of-bool.github.io/docs/vscode-cmake-tools/changelog.html).
 
+## 1.1.3
+
+Many thanks to [Yonggang Luo](https://github.com/lygstate) for several changes
+in this version.
+
+Removal:
+
+- The visual CMake cache editor GUI is gone. The API with which it was drawn is
+  being removed from a future version of VS Code, and the feature had many
+  issues. A future CMake GUI will be introduced with more features and greater
+  stability.
+
+Features and Tweaks:
+
+- On Linux, will detect old CMake versions and offer to do an automatic
+  upgrade. Windows support is pending. If you have a macOS devices and would
+  like to contribute, please open a pull request!
+- Smarter parsing of GCC and Clang compile errors to fold `note:` and
+  `required from:` blocks into their main diagnostic. This permits the
+  folding and browsing of template and macro instantiation errors in a nicer
+  fashion. MSVC error parsing pending. (**NOTE**: There is an upstream issue
+  with the sort order of diagnostic information, so `required from`
+  tracebacks may appear out-of-order).
+
+Fixes:
+
+- On Windows, "Launch target in terminal" will use `cmd.exe` unconditionally.
+  This works around issues with command quoting in PowerShell
+- "Debug target" will prefer `lldb-mi` to `lldb`. Fixes issues where `cpptools`
+  is unable to launch the debugger.
+- Document the `environmentVariables` field on kits.
+- Fix legacy CMake mode not setting the CMake generator.
+- Permit limited variable expansion for `cmake.cmakePath` in `settings.json`
+  (refer to documentation for more details).
+
 ## 1.1.2
 
 A bugfix release for [these issues](https://github.com/vector-of-bool/vscode-cmake-tools/milestone/13?closed=1).

README.md

@@ -6,6 +6,11 @@
 powerful configure+build workflow for CMake-based projects in
 Visual Studio Code.
 
+# Supporters
+
+- My first Patron, Shalom Craimer
+- The Phantom Derpstorm (ThePhD) [thephd.github.io](https://thephd.github.io/)
+
 ## 1.1.0 Changes! Exciting!
 
 **1.1.0** includes a few big new changes and features.

appveyor.yml

@@ -1,11 +1,9 @@
 version: 1.0.{build}-{branch}
 image:
   - Visual Studio 2017
-  - Visual Studio 2017 Preview
-  - Visual Studio 2015
 
 install:
-  - ps: Install-Product node 8.9.1 x64
+  - ps: Install-Product node 8.9.3 x64
 build_script:
   - pwsh: ./scripts/ci.ps1
 

docs/changelog.rst

@@ -3,6 +3,47 @@
 Changelog and History
 #####################
 
+.. _changes-1.1.3:
+
+1.1.3
+*****
+
+Removal:
+
+- The visual CMake cache editor GUI is gone. The API with which it was drawn is
+  being removed from a future version of VS Code, and the feature had many
+  issues. A future CMake GUI will be introduced with more features and greater
+  stability.
+  (`#579 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/579>`_)
+
+Features and Tweaks:
+
+- On Linux, will detect old CMake versions and offer to do an automatic
+  upgrade. Windows support is pending. If you have a macOS devices and would
+  like to contribute, please open a pull request!
+- Smarter parsing of GCC and Clang compile errors to fold ``note:`` and
+  ``required from:`` blocks into their main diagnostic. This permits the
+  folding and browsing of template and macro instantiation errors in a nicer
+  fashion. MSVC error parsing pending. (**NOTE**: There is an upstream issue
+  with the sort order of diagnostic information, so ``required from:``
+  tracebacks may appear out-of-order).
+
+Fixes:
+
+- On Windows, "Launch target in terminal" will use ``cmd.exe`` unconditionally.
+  This works around issues with command quoting in PowerShell.
+  (`#562 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/562>`_)
+- "Debug target" will prefer ``lldb-mi`` to ``lldb``. Fixes issues where
+  ``cpptools`` is unable to launch the debugger.
+  (`#584 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/584>`_)
+- Document the ``environmentVariables`` field on kits.
+  (`#586 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/568>`_)
+- Fix legacy CMake mode not setting the CMake generator.
+  (`#567 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/567>`_)
+- Permit limited variable expansion for ``cmake.cmakePath`` in ``settings.json``
+  (refer to documentation for more details).
+  (`#569 <https://github.com/vector-of-bool/vscode-cmake-tools/issues/569>`_)
+
 .. _changes-1.1.2:
 
 1.1.2
@@ -19,7 +60,7 @@ Fixes and tweaks upon 1.1.2:
 - Display a more helpful message when using a toolchain file and we fail to find
   the C and/or C++ compiler because it is not stored in the CMake cache.
 
-Full list of fixes are `these issues <https://github.com/vector-of-bool/vscode-cmake-tools/milestone/13?closed=1>`.
+`See the 1.1.2 milestone on GitHub <https://github.com/vector-of-bool/vscode-cmake-tools/milestone/13?closed=1>`_.
 
 .. _changes-1.1.1:
 
@@ -37,7 +78,7 @@ Fixes and tweaks upon 1.1.0:
 **BREAKING CHANGE**: Variant substitutions follow a new `${variant:var-key}`
 syntax to match the special namespacing of substitutions. See :ref:`variant-sub`.
 
-Full list of fixes are `these issues <https://github.com/vector-of-bool/vscode-cmake-tools/milestone/12?closed=1>`.
+`See the 1.1.1 milestone on GitHub <https://github.com/vector-of-bool/vscode-cmake-tools/milestone/12?closed=1>`_.
 
 .. _changes-1.1.0:
 

docs/kits.rst

@@ -235,4 +235,8 @@ In addition to the above options, the following may be specified:
     Prefer to use the ``settings.json`` for that purpose.
 
     This setting is most useful when the toolchain file respects additional
-    options that can be passed as cache variables.
+    options that can be passed as cache variables.
+
+``environmentVariables``
+    A JSON object of key-value pairs specifying additional environment
+    variables to be defined when using this kit.

docs/settings.rst

@@ -42,6 +42,9 @@ Specify location of the cmake executable.
 
 - Default: ``cmake``, which causes CMake Tools to search the ``PATH`` environment
   variable, as well as some hard-coded guesses.
+- *Supports substitution* of ``workspaceRoot``, ``workspaceRootFolderName``,
+  ``userHome``, ``${command:...}`` and ``${env:...}``. Other substitutions will
+  result in empty string.
 
 .. _conf-cmake.installPrefix:
 

package.json

@@ -2,7 +2,7 @@
   "name": "cmake-tools",
   "displayName": "CMake Tools",
   "description": "Extended CMake support in Visual Studio Code",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/vector-of-bool/vscode-cmake-tools"
@@ -20,7 +20,7 @@
   ],
   "publisher": "vector-of-bool",
   "engines": {
-    "vscode": "^1.25.0"
+    "vscode": "^1.29.1"
   },
   "categories": [
     "Other"
@@ -866,6 +866,12 @@
           "description": "Enable CMake server",
           "scope": "resource"
         },
+        "cmake.outputLogEncoding": {
+          "type": "string",
+          "default": "auto",
+          "description": "Encoding of the output from external commonds(eg.cmake -- build)",
+          "scope": "window"
+        },
         "cmake.enableTraceLogging": {
           "type": "boolean",
           "default": false,
@@ -885,6 +891,15 @@
             "fatal"
           ],
           "scope": "window"
+        },
+        "cmake.revealLog": {
+          "type": "string",
+          "default": "always",
+          "enum": [
+            "focus",
+            "always",
+            "never"
+          ]
         }
       }
     },
@@ -973,11 +988,11 @@
     "@types/js-yaml": "^3.5.28",
     "@types/json5": "~0.0.29",
     "@types/mocha": "~2.2.41",
-    "@types/node": "~8.0.0",
+    "@types/node": "~8.9.3",
     "@types/rimraf": "^0.0.28",
     "@types/sinon": "~4.3.3",
+    "@types/tmp": "^0.0.33",
     "@types/which": "~1.3.1",
-    "@types/ws": "^0.0.38",
     "@types/xml2js": "^0.0.28",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
@@ -988,21 +1003,21 @@
     "tslint": "^5.9.1",
     "typedoc": "~0.11.1",
     "typescript": "~2.8.3",
-    "vscode": "1.1.18"
+    "vscode": "1.1.21"
   },
   "dependencies": {
-    "Polymer": "1.6.1--",
     "ajv": "^4.7.5",
     "es6-promisify": "~5.0.0",
+    "iconv-lite": "^0.4.21",
     "js-yaml": "^3.6.1",
     "json5": "^0.5.1",
     "module-alias": "^2.0.6",
     "open": "0.0.5",
     "rimraf": "^2.5.4",
     "rollbar": "~2.2.8",
-    "vscode-cpptools": "^1.3.1",
+    "tmp": "^0.0.33",
+    "vscode-cpptools": "^2.1.2",
     "which": "~1.3.0",
-    "ws": "^1.1.1",
     "xml2js": "^0.4.17"
   }
 }

src/api.ts

@@ -7,7 +7,7 @@
  * Copy the `api.ts` source file into your project to use it.
  */ /** */
 
-import {DebugSession, DiagnosticCollection, Disposable, Event, Terminal} from 'vscode';
+import {DebugSession, Disposable, Event, Terminal} from 'vscode';
 
 
 /**
@@ -168,10 +168,6 @@ export interface CMakeToolsAPI extends Disposable {
    * List of CMake targets created via `add_executable()`.
    */
   readonly executableTargets: Thenable<ExecutableTarget[]>;
-  /**
-   * CMake code diagnostics. Includes warnings and errors, etc.
-   */
-  readonly diagnostics: Thenable<DiagnosticCollection>;
   /**
    * All targets available to be built
    */