Code analysis refactor

Extension/src/LanguageServer/Providers/codeActionProvider.ts

@@ -5,8 +5,9 @@
 import * as vscode from 'vscode';
 import {  Position, Range, RequestType, TextEdit } from 'vscode-languageclient';
 import * as util from '../../common';
+import { DefaultClient } from '../client';
 import { CodeActionCodeInfo, CodeActionDiagnosticInfo, codeAnalysisFileToCodeActions, codeAnalysisCodeToFixes,
-    codeAnalysisAllFixes, DefaultClient } from '../client';
+    codeAnalysisAllFixes } from '../codeAnalysis';
 import { makeVscodeRange } from '../utils';
 import { CppSettings } from '../settings';
 

Extension/src/LanguageServer/commonTypes.ts

@@ -0,0 +1,21 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+import { Range } from 'vscode-languageclient';
+
+/** Differs from vscode.Location, which has a uri of type vscode.Uri. */
+export interface Location {
+    uri: string;
+    range: Range;
+}
+
+export interface TextEdit {
+    range: Range;
+    newText: string;
+}
+
+export interface WorkspaceEdit {
+    changes: { [uri: string]: TextEdit[] };
+}

Extension/src/LanguageServer/extension.ts

@@ -12,8 +12,9 @@ import * as util from '../common';
 import * as telemetry from '../telemetry';
 import { TreeNode, NodeType } from './referencesModel';
 import { UI, getUI } from './ui';
-import { Client, openFileVersions, CodeAnalysisDiagnosticIdentifiersAndUri, CodeActionDiagnosticInfo, codeAnalysisCodeToFixes,
-    codeAnalysisFileToCodeActions, codeAnalysisAllFixes } from './client';
+import { Client, openFileVersions } from './client';
+import { CodeAnalysisDiagnosticIdentifiersAndUri, CodeActionDiagnosticInfo, codeAnalysisCodeToFixes,
+    codeAnalysisFileToCodeActions, codeAnalysisAllFixes } from './codeAnalysis';
 import { makeCpptoolsRange, rangeEquals } from './utils';
 import { ClientCollection } from './clientCollection';
 import { CppSettings, OtherSettings } from './settings';

Extension/src/LanguageServer/localization.ts

@@ -0,0 +1,26 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All Rights Reserved.
+ * See 'LICENSE' in the project root for license information.
+ * ------------------------------------------------------------------------------------------ */
+'use strict';
+
+import { lookupString } from '../nativeStrings';
+
+export interface LocalizeStringParams {
+    text: string;
+    stringId: number;
+    stringArgs: string[];
+    indentSpaces: number;
+}
+
+export function getLocalizedString(params: LocalizeStringParams): string {
+    let indent: string = "";
+    if (params.indentSpaces) {
+        indent = " ".repeat(params.indentSpaces);
+    }
+    let text: string = params.text;
+    if (params.stringId !== 0) {
+        text = lookupString(params.stringId, params.stringArgs);
+    }
+    return indent + text;
+}

Extension/src/LanguageServer/utils.ts

@@ -5,17 +5,7 @@
 'use strict';
 import * as vscode from 'vscode';
 import { Range } from 'vscode-languageclient';
-
-/** Differs from vscode.Location, which has a uri of type vscode.Uri. */
-export interface Location {
-    uri: string;
-    range: Range;
-}
-
-export interface TextEdit {
-    range: Range;
-    newText: string;
-}
+import { Location, TextEdit } from './commonTypes';
 
 export function makeCpptoolsRange(vscRange: vscode.Range): Range {
     return { start: { line: vscRange.start.line, character: vscRange.start.character },