Plumbing for sending 'files.encoding' to native process (#6040)

Author: Colengms

Extension/ThirdPartyNotices.txt

@@ -1027,6 +1027,32 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+
+-------------------------------------------------------------------
+
+-------------------------------------------------------------------
+
+libiconv - Pre-installed on target platforms: Mac, Linux
+https://www.gnu.org/software/libiconv/
+/* Copyright (C) 1997-2020 Free Software Foundation, Inc.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with the GNU C Library; if not, see
+https://www.gnu.org/licenses/. */
+
+http://www.gnu.org/licenses/lgpl.html
+
+
 -------------------------------------------------------------------
 
 -------------------------------------------------------------------

Extension/src/LanguageServer/client.ts

@@ -1420,6 +1420,7 @@ export class DefaultClient implements Client {
         const settings_clangFormatStyle: (string | undefined)[] = [];
         const settings_clangFormatFallbackStyle: (string | undefined)[] = [];
         const settings_clangFormatSortIncludes: (string | undefined)[] = [];
+        const settings_filesEncoding: (string | undefined)[] = [];
         const settings_filesExclude: (vscode.WorkspaceConfiguration | undefined)[] = [];
         const settings_searchExclude: (vscode.WorkspaceConfiguration | undefined)[] = [];
         const settings_intelliSenseEngine: (string | undefined)[] = [];
@@ -1589,6 +1590,7 @@ export class DefaultClient implements Client {
             }
 
             for (const otherSetting of otherSettings) {
+                settings_filesEncoding.push(otherSetting.filesEncoding);
                 settings_filesExclude.push(otherSetting.filesExclude);
                 settings_searchExclude.push(otherSetting.searchExclude);
             }
@@ -1695,6 +1697,10 @@ export class DefaultClient implements Client {
                 clang_format_fallbackStyle: settings_clangFormatFallbackStyle,
                 clang_format_sortIncludes: settings_clangFormatSortIncludes,
                 extension_path: util.extensionPath,
+                files: {
+                    encoding: settings_filesEncoding
+                },
+                workspace_fallback_encoding: workspaceOtherSettings.filesEncoding,
                 exclude_files: settings_filesExclude,
                 exclude_search: settings_searchExclude,
                 associations: workspaceOtherSettings.filesAssociations,
@@ -1772,6 +1778,9 @@ export class DefaultClient implements Client {
             cppSettingsScoped["default"] = { systemIncludePath: cppSettingsResourceScoped.get("default.systemIncludePath") };
         }
 
+        const otherSettingsFolder: OtherSettings = new OtherSettings(this.RootUri);
+        const otherSettingsWorkspace: OtherSettings = new OtherSettings();
+
         // Unlike the LSP message, the event does not contain all settings as a payload, so we need to
         // build a new JSON object with everything we need on the native side.
         const settings: any = {
@@ -1791,9 +1800,11 @@ export class DefaultClient implements Client {
                 tabSize: vscode.workspace.getConfiguration("editor.tabSize", this.RootUri)
             },
             files: {
+                encoding: otherSettingsFolder.filesEncoding,
                 exclude: vscode.workspace.getConfiguration("files.exclude", this.RootUri),
                 associations: new OtherSettings().filesAssociations
             },
+            workspace_fallback_encoding: otherSettingsWorkspace.filesEncoding,
             search: {
                 exclude: vscode.workspace.getConfiguration("search.exclude", this.RootUri)
             }

Extension/src/LanguageServer/settings.ts

@@ -24,7 +24,7 @@ class Settings {
      * @param resource The path to a resource to which the settings should apply, or undefined if global settings are desired
      */
     constructor(section: string, resource?: vscode.Uri) {
-        this.settings = vscode.workspace.getConfiguration(section, resource ? resource : null);
+        this.settings = vscode.workspace.getConfiguration(section, resource ? resource : undefined);
     }
 
     protected get Section(): vscode.WorkspaceConfiguration { return this.settings; }
@@ -429,19 +429,20 @@ export interface TextMateRule {
 }
 
 export class OtherSettings {
-    private resource: vscode.Uri | null;
+    private resource: vscode.Uri | undefined;
 
-    constructor(resource?: vscode.Uri | null) {
+    constructor(resource?: vscode.Uri) {
         if (!resource) {
-            resource = null;
+            resource = undefined;
         }
         this.resource = resource;
     }
 
     public get editorTabSize(): number | undefined { return vscode.workspace.getConfiguration("editor", this.resource).get<number>("tabSize"); }
-    public get filesAssociations(): any { return vscode.workspace.getConfiguration("files", null).get("associations"); }
+    public get filesEncoding(): string | undefined { return vscode.workspace.getConfiguration("files", { uri: this.resource, languageId: "cpp" }).get<string>("encoding"); }
+    public get filesAssociations(): any { return vscode.workspace.getConfiguration("files").get("associations"); }
     public set filesAssociations(value: any) {
-        vscode.workspace.getConfiguration("files", null).update("associations", value, vscode.ConfigurationTarget.Workspace);
+        vscode.workspace.getConfiguration("files").update("associations", value, vscode.ConfigurationTarget.Workspace);
     }
     public get filesExclude(): vscode.WorkspaceConfiguration | undefined { return vscode.workspace.getConfiguration("files", this.resource).get("exclude"); }
     public get searchExclude(): vscode.WorkspaceConfiguration | undefined { return vscode.workspace.getConfiguration("search", this.resource).get("exclude"); }