Add MacOS version check

MikhailArkhipov · MikhailArkhipov · commit 70b13f75b01c · 2018-08-07T12:49:03.000-07:00
diff --git a/src/client/activation/languageServer.ts b/src/client/activation/languageServer.ts
@@ -3,18 +3,24 @@
 
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import { CancellationToken, CompletionContext, OutputChannel, Position,
-     TextDocument, Uri } from 'vscode';
-import { Disposable, LanguageClient, LanguageClientOptions,
-    ProvideCompletionItemsSignature, ServerOptions } from 'vscode-languageclient';
+import {
+    CancellationToken, CompletionContext, OutputChannel, Position,
+    TextDocument, Uri
+} from 'vscode';
+import {
+    Disposable, LanguageClient, LanguageClientOptions,
+    ProvideCompletionItemsSignature, ServerOptions
+} from 'vscode-languageclient';
 import { IApplicationShell, ICommandManager, IWorkspaceService } from '../common/application/types';
 import { PythonSettings } from '../common/configSettings';
 import { isTestExecution, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import { createDeferred, Deferred } from '../common/helpers';
 import { IFileSystem, IPlatformService } from '../common/platform/types';
 import { StopWatch } from '../common/stopWatch';
-import { BANNER_NAME_LS_SURVEY, IConfigurationService, IExtensionContext, ILogger,
-    IOutputChannel, IPythonExtensionBanner, IPythonSettings } from '../common/types';
+import {
+    BANNER_NAME_LS_SURVEY, IConfigurationService, IExtensionContext, ILogger,
+    IOutputChannel, IPythonExtensionBanner, IPythonSettings
+} from '../common/types';
 import { IServiceContainer } from '../ioc/types';
 import {
     PYTHON_LANGUAGE_SERVER_DOWNLOADED,
@@ -91,6 +97,10 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
     }
 
     public async activate(): Promise<boolean> {
+        if (!this.checkSupportedPlatform()) {
+            return false;
+        }
+
         this.sw.reset();
         const clientOptions = await this.getAnalysisOptions();
         if (!clientOptions) {
@@ -115,6 +125,15 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
         (this.configuration.getSettings() as PythonSettings).removeListener('change', this.onSettingsChanged.bind(this));
     }
 
+    private checkSupportedPlatform(): boolean {
+        const platform = this.services.get<IPlatformService>(IPlatformService);
+        if (platform.isMac && platform.versionMajor === 10 && platform.versionMinor < 12) {
+            this.services.get<ILogger>(ILogger).logError('Unsupported MacOS');
+            this.appShell.showErrorMessage('Microsoft Python Language Server does not support MacOS older than 10.12.');
+            return false;
+        }
+        return true;
+    }
     private async startLanguageServer(clientOptions: LanguageClientOptions): Promise<boolean> {
         // Determine if we are running MSIL/Universal via dotnet or self-contained app.
 
diff --git a/src/client/common/platform/platformService.ts b/src/client/common/platform/platformService.ts
@@ -3,7 +3,7 @@
 'use strict';
 
 import { injectable } from 'inversify';
-import { arch } from 'os';
+import { arch, release } from 'os';
 import { NON_WINDOWS_PATH_VARIABLE_NAME, WINDOWS_PATH_VARIABLE_NAME } from './constants';
 import { IPlatformService } from './types';
 
@@ -34,4 +34,15 @@ export class PlatformService implements IPlatformService {
     public get virtualEnvBinName() {
         return this.isWindows ? 'scripts' : 'bin';
     }
+    public get version(): string {
+        return release();
+    }
+    public get versionMajor(): number {
+        const parts = this.version.split('.');
+        return parts.length > 0 ? parseInt(parts[0], 10) : 0;
+    }
+    public get versionMinor(): number {
+        const parts = this.version.split('.');
+        return parts.length > 1 ? parseInt(parts[1], 10) : 0;
+    }
 }
diff --git a/src/client/common/platform/types.ts b/src/client/common/platform/types.ts
@@ -27,6 +27,9 @@ export interface IPlatformService {
     is64bit: boolean;
     pathVariableName: 'Path' | 'PATH';
     virtualEnvBinName: 'bin' | 'scripts';
+    version: string;
+    versionMajor: number;
+    versionMinor: number;
 }
 
 export type TemporaryFile = { filePath: string } & Disposable;

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ export interface IPlatformService {`
`27`	`27`	`is64bit: boolean;`
`28`	`28`	`pathVariableName: 'Path' \| 'PATH';`
`29`	`29`	`virtualEnvBinName: 'bin' \| 'scripts';`
	`30`	`+ version: string;`
	`31`	`+ versionMajor: number;`
	`32`	`+ versionMinor: number;`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`export type TemporaryFile = { filePath: string } & Disposable;`